Revision: 57d7c86f47aa
Author: Jean Deruelle <[email protected]>
Date: Thu Aug 2 12:54:24 2012
Log: Fixes Issue 145
http://code.google.com/p/sipservlets/source/detail?r=57d7c86f47aa
Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.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/SipFactoryImpl.java
Mon Jul 30 15:04:45 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Thu Aug 2 12:54:24 2012
@@ -486,10 +486,14 @@
* @see javax.servlet.sip.SipFactory#createSipURI(java.lang.String,
* java.lang.String)
*/
- public SipURI createSipURI(String user, String host) {
+ public SipURI createSipURI(String user, String host) {
if (logger.isDebugEnabled()) {
logger.debug("Creating SipURI from USER[" + user + "]
HOST[" + host
+ "]");
+ }
+ // Fix for
http://code.google.com/p/sipservlets/issues/detail?id=145
+ if(user != null && user.trim().isEmpty()) {
+ user = null;
}
try {
return new
SipURIImpl(SipFactoryImpl.addressFactory.createSipURI(
=======================================
---
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Wed Oct 12 08:05:51 2011
+++
/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java
Thu Aug 2 12:54:24 2012
@@ -144,7 +144,8 @@
return;
}
- if(sipServletResponse.getRequest().isInitial()
&& !(sipServletResponse.getFrom().getURI() instanceof TelURL)
&& !(sipServletResponse.getTo().getURI() instanceof TelURL) &&
+ if(sipServletResponse.getRequest().isInitial()
&& !(sipServletResponse.getFrom().getURI() instanceof TelURL)
&& !(sipServletResponse.getTo().getURI() instanceof TelURL) &&
+
((SipURI)sipServletResponse.getFrom().getURI()).getUser() != null &&
(((SipURI)sipServletResponse.getFrom().getURI()).getUser().equals("reinvite")
||
((SipURI)sipServletResponse.getTo().getURI()).getUser().equals("reinvite")))
{
SipServletRequest
request=sipServletResponse.getSession().createRequest("INVITE");
request.send();
@@ -305,6 +306,9 @@
if(userName == null || userName.length() < 1) {
userName = "BigGuy";
}
+ if(userName.equalsIgnoreCase("nullTest")) {
+ userName = "";
+ }
URI fromURI = sipFactory.createSipURI(userName,
"here.com");
URI toURI = null;
if(ce.getServletContext().getInitParameter("urlType")
!= null) {
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Wed Oct 12 08:05:51 2011
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java
Thu Aug 2 12:54:24 2012
@@ -35,6 +35,7 @@
import javax.sip.address.SipURI;
import javax.sip.header.AuthorizationHeader;
import javax.sip.header.ContactHeader;
+import javax.sip.header.FromHeader;
import javax.sip.header.ProxyAuthenticateHeader;
import javax.sip.header.ProxyAuthorizationHeader;
import javax.sip.header.ToHeader;
@@ -377,6 +378,31 @@
assertEquals("To: <sip:+34666666666@" +
System.getProperty("org.mobicents.testsuite.testhostaddr")
+ ":5080;pres-list=mylist>", toHeader.toString().trim());
assertTrue(receiver.getByeReceived());
}
+
+ /**
+ * non regression test for Issue 145
http://code.google.com/p/sipservlets/issues/detail?id=145
+ */
+ public void testShootistUserNameNull() throws Exception {
+// receiver.sendInvite();
+ receiverProtocolObjects =new ProtocolObjects(
+ "sender", "gov.nist", TRANSPORT, AUTODIALOG,
null, null, null);
+
+ receiver = new TestSipListener(5080, 5070, receiverProtocolObjects,
false);
+ SipProvider senderProvider = receiver.createProvider();
+
+ senderProvider.addSipListener(receiver);
+
+ receiverProtocolObjects.start();
+ tomcat.startTomcat();
+ Map<String, String> params = new HashMap<String, String>();
+ String userName = "nullTest";
+ params.put("username", userName);
+ deployApplication(params);
+ Thread.sleep(TIMEOUT);
+ FromHeader fromHeader = (FromHeader)
receiver.getInviteRequest().getHeader(FromHeader.NAME);
+ assertEquals("sip:here.com",
fromHeader.getAddress().getURI().toString().trim());
+ assertTrue(receiver.getByeReceived());
+ }
/**
* non regression test for Issue 755
http://code.google.com/p/mobicents/issues/detail?id=755