You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/11 13:47:43 UTC
svn commit: r713025 - in /activemq/camel/branches/camel-1.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Author: ningjiang
Date: Tue Nov 11 04:47:41 2008
New Revision: 713025
URL: http://svn.apache.org/viewvc?rev=713025&view=rev
Log:
Merged revisions 713013 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r713013 | ningjiang | 2008-11-11 18:43:19 +0800 (Tue, 11 Nov 2008) | 1 line
CAMEL-246 change to throw the IllegalArgumentException instead of CamelException
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 04:47:41 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 11 04:47:41 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712,712925
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712,712925,713013
Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=713025&r1=713024&r2=713025&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java Tue Nov 11 04:47:41 2008
@@ -420,7 +420,8 @@
endpoint.getConfiguration().setConnectionFactory(ucfa);
} else {
if (username != null || password != null) {
- throw new CamelException("The JmsComponent's username or password is null");
+ // exclude the the saturation of username and password are all empty
+ throw new IllegalArgumentException("The JmsComponent's username or password is null");
}
}
setProperties(endpoint.getConfiguration(), parameters);