You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/09/21 08:54:07 UTC

svn commit: r1388346 - in /camel/branches/camel-2.10.x: ./ components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java

Author: davsclaus
Date: Fri Sep 21 06:54:07 2012
New Revision: 1388346

URL: http://svn.apache.org/viewvc?rev=1388346&view=rev
Log:
CAMEL-5624: Santize the uri to mask password. Thanks to Joao Loureiro for the patch.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
    camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1388345

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java?rev=1388346&r1=1388345&r2=1388346&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java Fri Sep 21 06:54:07 2012
@@ -29,6 +29,7 @@ import org.apache.camel.PollingConsumer;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultPollingEndpoint;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
 
 /**
  * AS/400 Data queue endpoint
@@ -95,7 +96,7 @@ public class Jt400DataQueueEndpoint exte
         try {
             baseEndpoint = new Jt400Endpoint(endpointUri, connectionPool);
         } catch (URISyntaxException e) {
-            throw new CamelException("Unable to parse URI for " + endpointUri, e);
+            throw new CamelException("Unable to parse URI for " + URISupport.sanitizeUri(endpointUri), e);
         }
     }
 

Modified: camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java?rev=1388346&r1=1388345&r2=1388346&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java Fri Sep 21 06:54:07 2012
@@ -34,6 +34,7 @@ import org.apache.camel.component.jt400.
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
 
 public class Jt400PgmEndpoint extends DefaultEndpoint {
     /**
@@ -64,7 +65,7 @@ public class Jt400PgmEndpoint extends De
         try {
             baseEndpoint = new Jt400Endpoint(endpointUri, connectionPool);
         } catch (URISyntaxException e) {
-            throw new CamelException("Unable to parse URI for " + endpointUri, e);
+            throw new CamelException("Unable to parse URI for " + URISupport.sanitizeUri(endpointUri), e);
         }
     }