Revision: 17324
Author: [email protected]
Date: Tue Mar 15 04:07:59 2011
Log: Update Issue 2427

Committing patch and adding a non regression test case
http://code.google.com/p/mobicents/source/detail?r=17324

Modified:
/trunk/servers/sip-servlets/sip-servlets-bootstrap/src/site/apt/acknowledgements.apt /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-bootstrap/src/site/apt/acknowledgements.apt Fri Mar 11 05:37:59 2011 +++ /trunk/servers/sip-servlets/sip-servlets-bootstrap/src/site/apt/acknowledgements.apt Tue Mar 15 04:07:59 2011
@@ -97,4 +97,8 @@
* reported {{{http://code.google.com/p/mobicents/issues/detail?id=2321}Issue 2321}} and contributed a fix for it

* reported {{{http://code.google.com/p/mobicents/issues/detail?id=2420}Issue 2420}} and contributed a fix for it
-
+
+ * reported {{{http://code.google.com/p/mobicents/issues/detail?id=2420}Issue 2427}} and contributed a fix for it
+
+ * reported {{{http://code.google.com/p/mobicents/issues/detail?id=2420}Issue 2429}} and contributed a fix for it
+
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Mon Jan 24 05:10:42 2011 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Tue Mar 15 04:07:59 2011
@@ -1807,7 +1807,8 @@
                        currentApplicationName = null;
                }
                isMessageSent = in.readBoolean();
- if(((ClusteredSipStack)StaticServiceHolder.sipStandardService.getSipStack()).getReplicationStrategy() == ReplicationStrategy.EarlyDialog) { + if(StaticServiceHolder.sipStandardService.getSipStack() instanceof ClusteredSipStack && + ((ClusteredSipStack)StaticServiceHolder.sipStandardService.getSipStack()).getReplicationStrategy() == ReplicationStrategy.EarlyDialog) {
                        transactionId = in.readUTF();
                        if(transactionId != null) {
                                if(transactionId.equals("")) {
@@ -1830,7 +1831,7 @@
                } else {
                        out.writeUTF(sipSession.getId());
                }
-               if(attributes != null) {
+               if(attributes != null && attributes.size() > 0) {
                        out.writeInt(attributes.size());
                        Object[][] attributesArray = new 
Object[2][attributes.size()];
                        int i = 0;
@@ -1851,7 +1852,8 @@
                        out.writeUTF("");
                }
                out.writeBoolean(isMessageSent);
- if(((ClusteredSipStack)StaticServiceHolder.sipStandardService.getSipStack()).getReplicationStrategy() == ReplicationStrategy.EarlyDialog) { + if(StaticServiceHolder.sipStandardService.getSipStack() instanceof ClusteredSipStack && + ((ClusteredSipStack)StaticServiceHolder.sipStandardService.getSipStack()).getReplicationStrategy() == ReplicationStrategy.EarlyDialog) {
                        if(transaction == null) {
                                out.writeUTF("");
                        } else {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Fri Dec 10 09:42:26 2010 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Tue Mar 15 04:07:59 2011
@@ -17,7 +17,11 @@
 package org.mobicents.servlet.sip.testsuite;

 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Iterator;

@@ -87,6 +91,7 @@
        private static final String TEST_CANCEL_USERNAME = "cancel";
        private static final String TEST_BYE_ON_DESTROY = "testByeOnDestroy";
        private static final String TEST_NO_ACK_RECEIVED = "noAckReceived";
+       private static final String TEST_SERIALIZATION = "serialization";

        @Resource
        SipFactory sipFactory;
@@ -318,9 +323,57 @@
sipServletResponse.getSession().setAttribute("okResponse", sipServletResponse);

                        return;
-               }
+               }
if(!TEST_CANCEL_USERNAME.equalsIgnoreCase(((SipURI)request.getFrom().getURI()).getUser())) { SipServletResponse sipServletResponse = request.createResponse(SipServletResponse.SC_RINGING);
+                       if(fromString.contains(TEST_SERIALIZATION)) {
+                               FileOutputStream fos =
+                                    new FileOutputStream("val.ser");
+                               ObjectOutputStream oos = new 
ObjectOutputStream(fos);
+                               oos.writeObject(request);
+                               oos.close();
+                               fos.close();
+                               FileInputStream fis =
+                                     new FileInputStream("val.ser");
+                               ObjectInputStream ois = new 
ObjectInputStream(fis);
+                               try {
+ SipServletRequest deserializedRequest = (SipServletRequest) ois.readObject();
+                                       
if(!deserializedRequest.toString().equals(request.toString())) {
+ logger.error("deserializedRequest " + deserializedRequest + " different from received request " + request); + sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
+                                               sipServletResponse.send();
+                                               return;
+                                       }
+                               } catch (ClassNotFoundException e) {
+                                       e.printStackTrace();
+                               } finally {
+                                       ois.close();
+                                       fis.close();
+                               }
+
+                               fos =new FileOutputStream("val.ser");
+                               oos = new ObjectOutputStream(fos);
+                               oos.writeObject(sipServletResponse);
+                               oos.close();
+                               fos.close();
+                               fis = new FileInputStream("val.ser");
+                               ois = new ObjectInputStream(fis);
+                               try {
+ SipServletResponse deserializedResponse = (SipServletResponse) ois.readObject(); + if(!deserializedResponse.toString().equals(sipServletResponse.toString())) { + logger.error("deserializedResponse " + deserializedResponse + " different from response " + sipServletResponse); + sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
+                                               sipServletResponse.send();
+                                               return;
+                                       }
+                               } catch (ClassNotFoundException e) {
+                                       e.printStackTrace();
+                               } finally {
+                                       ois.close();
+                                       fis.close();
+                               }
+
+                       }
                        if(sipServletResponse.getParameterableHeader("Contact") 
== null) {
logger.error("the Contact Header on a non 3xx or 485 response should be set"); sipServletResponse = request.createResponse(SipServletResponse.SC_SERVER_INTERNAL_ERROR);
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java Wed Mar 9 13:39:24 2011 +++ /trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java Tue Mar 15 04:07:59 2011
@@ -538,6 +538,24 @@
                assertEquals("noAckReceived", allMessagesContent.get(0));
                assertTrue( sender.getNbRetrans() >= 9);
        }
+
+       // test for http://code.google.com/p/mobicents/issues/detail?id=2427
+ public void testShootmeSerializationDeserialization() throws InterruptedException, SipException, ParseException, InvalidArgumentException {
+               String fromName = "serialization";
+               String fromSipAddress = "sip-servlets.com";
+               SipURI fromAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               fromName, fromSipAddress);
+
+               String toUser = "receiver";
+               String toSipAddress = "sip-servlets.com";
+               SipURI toAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               toUser, toSipAddress);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null, false);
+               Thread.sleep(TIMEOUT);
+               assertTrue(sender.isAckSent());
+               assertTrue(sender.getOkToByeReceived());
+       }

        public void testShootmeServerHeader() throws Exception {
                String fromName = "sender";

Reply via email to