Merge branch 'master' of github.com:RestComm/Restcomm-Connect

Author: gvagenas

release/build.xml

@@ -33,7 +33,7 @@
   <property name="restcomm-media.distro.zip.path" value="${checkout.dir}/${restcomm-media.download.distro.file}"/>
 
   <!-- <property name="restcomm-olympus.download.url" value="https://mobicents.ci.cloudbees.com/job/Olympus/${olympus.build}/artifact/target/olympus.war"/> -->
-  <property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/0rf2w3q7r0g2b4p4rtptc24wauxegfsf.war"/>
+  <property name="restcomm-olympus.download.url" value="https://app.box.com/shared/static/p78uyxuuzg4fa8kl68ljiyzjkl9ei3r8.war"/>
   <property name="restcomm-olympus.path" value="${configuration.directory}/olympus.war"/>
 
   <!-- Determine RVD retrieval URL

restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/release-notes.adoc

@@ -29,6 +29,7 @@ The folowing tags are used to categorize and state the scope of a change
 * Configurable inbound/outbound SMPP encoding
 * Race condition on sending BYE to incoming call for a dial fork scenario
 * Fixed SDR event for SMS - **commercial**
+* Fixed REFER (Call Transfer) support to work with organizations
 
 
 === Migration Notes

restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/SIPOrganizationUtil.java

@@ -19,6 +19,8 @@
  */
 package org.restcomm.connect.interpreter;
 
+import javax.servlet.sip.Address;
+import javax.servlet.sip.ServletParseException;
 import javax.servlet.sip.SipServletRequest;
 import javax.servlet.sip.SipURI;
 import org.apache.log4j.Logger;
@@ -50,6 +52,18 @@ public static Sid searchOrganizationBySIPRequest(OrganizationsDao orgDao, SipSer
             // try to get destinationOrganizationSid from toUri
             destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, (SipURI) request.getTo().getURI());
         }
+        if (destinationOrganizationSid == null) {
+            // try to get destinationOrganizationSid from Refer-To
+            Address referAddress;
+            try {
+                referAddress = request.getAddressHeader("Refer-To");
+                if(referAddress != null){
+                    destinationOrganizationSid = getOrganizationSidBySipURIHost(orgDao, (SipURI) referAddress.getURI());
+                }
+            } catch (ServletParseException e) {
+                logger.error(e);
+            }
+        }
         return destinationOrganizationSid;
     }
 }