svn commit: r1419535 - in /axis/axis1/java/branches/AXIS-2882: axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java

[veithen]

Author: veithen
Date: Mon Dec 10 15:50:26 2012
New Revision: 1419535

URL: http://svn.apache.org/viewvc?rev=1419535&view=rev
Log:
More work on AXIS-2882.

Modified:
    
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
    
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java

Modified: 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java?rev=1419535&r1=1419534&r2=1419535&view=diff
==============================================================================
--- 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
 Mon Dec 10 15:50:26 2012
@@ -26,10 +26,11 @@ import org.apache.axis.handlers.BasicHan
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.message.SOAPFault;
 import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.IOUtils;
 import org.apache.axis.utils.Messages;
 import org.apache.commons.logging.Log;
 
-import java.net.URL;
+import java.net.URI;
 
 /**
  * This is meant to be used on a SOAP Client to call a SOAP server.
@@ -114,8 +115,8 @@ public class LocalSender extends BasicHa
         String transURL = clientContext.getStrProp(MessageContext.TRANS_URL);
         if (transURL != null) {
             try {
-                URL url = new URL(transURL);
-                String file = url.getFile();
+                URI url = IOUtils.toURI(transURL);
+                String file = url.getPath();
                 if (file.length()>0 && file.charAt(0)=='/') {
                     file = file.substring(1);
                 }

Modified: 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java?rev=1419535&r1=1419534&r2=1419535&view=diff
==============================================================================
--- 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
 (original)
+++ 
axis/axis1/java/branches/AXIS-2882/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
 Mon Dec 10 15:50:26 2012
@@ -108,8 +108,7 @@ public class JMSURLTest {
 
         try
         {
-            java.net.URL jmsurl = new java.net.URL(sampleJmsUrl);
-            call.setTargetEndpointAddress(jmsurl);
+            call.setTargetEndpointAddress(sampleJmsUrl);
 
             // set additional params on the call if desired
             call.setUsername(username);
@@ -118,10 +117,6 @@ public class JMSURLTest {
 
             res = (Float) call.invoke(new Object[] {ticker});
         }
-        catch (java.net.MalformedURLException e)
-        {
-            throw new AxisFault("Invalid JMS URL", e);
-        }
         catch (java.rmi.RemoteException e)
         {
             throw new AxisFault("Failed in getQuote()", e);