Revision: 0a8b87726549
Author: Jean Deruelle <[email protected]>
Date: Fri Apr 25 19:13:03 2014 UTC
Log: Update Issue 169
Fix + non regression test
http://code.google.com/p/sipservlets/source/detail?r=0a8b87726549
Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
Fri Apr 25 16:34:22 2014 UTC
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
Fri Apr 25 19:13:03 2014 UTC
@@ -1337,7 +1337,8 @@
ContentTypeHeader contentTypeHeader =
(ContentTypeHeader)this.message.getHeader(ContentTypeHeader.NAME);
String charset = this.getCharacterEncoding();
try {
-
if(contentType.contains(CONTENT_TYPE_MULTIPART)) {
+ //
https://code.google.com/p/sipservlets/issues/detail?id=169
+ if(contentType.contains(CONTENT_TYPE_MULTIPART) && content instanceof
Multipart) {
// Fix for Issue 2667 : Correct
Handling of MimeMultipart
Multipart multipart = (Multipart)
content;
OutputStream os = new
ByteArrayOutputStream();
=======================================
---
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Mon Jan 28 17:54:52 2013 UTC
+++
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Fri Apr 25 19:13:03 2014 UTC
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -535,6 +536,14 @@
sipServletRequest.getInitialRemotePort();
sipServletRequest.getInitialTransport();
}
+ if(ce.getServletContext().getInitParameter("testMultipartBytes") !=
null) {
+ //
https://code.google.com/p/sipservlets/issues/detail?id=169
+ try {
+ sipServletRequest.setContent(new String("test
Multipart"), "multipart/unknown");
+ } catch (UnsupportedEncodingException e) {
+ throw new IllegalStateException("couldn't set the
content", e);
+ }
+ }
try {
sipServletRequest.send();
} catch (IOException e) {
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Mon Jan 28 17:54:52 2013 UTC
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Fri Apr 25 19:13:03 2014 UTC
@@ -978,7 +978,25 @@
deployApplication("testRemoteAddrAndPort", "true");
Thread.sleep(TIMEOUT);
assertTrue(receiver.getByeReceived());
- }
+ }
+
+ // https://code.google.com/p/sipservlets/issues/detail?id=169
+ public void testShootistMultipartBytes() throws Exception {
+ receiverProtocolObjects =new ProtocolObjects(
+ "sender", "gov.nist", TRANSPORT, AUTODIALOG, null, null,
null);
+
+ receiver = new TestSipListener(5080, 5070,
receiverProtocolObjects, false);
+ receiver.setProvisionalResponsesToSend(new ArrayList<Integer>());
+ SipProvider senderProvider = receiver.createProvider();
+
+ senderProvider.addSipListener(receiver);
+
+ receiverProtocolObjects.start();
+ tomcat.startTomcat();
+ deployApplication("testMultipartBytes", "true");
+ Thread.sleep(TIMEOUT);
+ assertTrue(receiver.getByeReceived());
+ }
@Override
@After
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.