camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r731839 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/converter/jaxp/ components/camel-jms/src/main/java/org/apache/camel/component/jms/ components/camel-jms/src/test/java/org/apache/camel/component/j...
Date Tue, 06 Jan 2009 05:44:58 GMT
Author: davsclaus
Date: Mon Jan  5 21:44:58 2009
New Revision: 731839

URL: http://svn.apache.org/viewvc?rev=731839&view=rev
Log:
Merged revisions 731836 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r731836 | davsclaus | 2009-01-06 06:31:43 +0100 (ti, 06 jan 2009) | 1 line
  
  CAMEL-1213: Fixed setting exchanged id in camel-jms. Polished to use ObjectHelper.notNull
........

Added:
    activemq/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
      - copied unchanged from r731836, activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/BytesSource.java
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
    activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  5 21:44:58 2009
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836

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

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/BytesSource.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/BytesSource.java?rev=731839&r1=731838&r2=731839&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/BytesSource.java
(original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/BytesSource.java
Mon Jan  5 21:44:58 2009
@@ -23,6 +23,8 @@
 
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.camel.util.ObjectHelper;
+
 /**
  * A helper class which provides a JAXP {@link javax.xml.transform.Source Source} from a
byte[]
  * which can be read as many times as required.
@@ -33,10 +35,12 @@
     private byte[] data;
 
     public BytesSource(byte[] data) {
+        ObjectHelper.notNull(data, "data");
         this.data = data;
     }
 
     public BytesSource(byte[] data, String systemId) {
+        ObjectHelper.notNull(data, "data");
         this.data = data;
         setSystemId(systemId);
     }

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java?rev=731839&r1=731838&r2=731839&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
(original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
Mon Jan  5 21:44:58 2009
@@ -28,6 +28,8 @@
 
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.camel.util.ObjectHelper;
+
 /**
  * A helper class which provides a JAXP {@link javax.xml.transform.Source Source} from a
String which can
  * be read as many times as required.
@@ -42,9 +44,7 @@
     }
 
     public StringSource(String text) {
-        if (text == null) {
-            throw new NullPointerException("text can not be null");
-        }
+        ObjectHelper.notNull(text, "text");
         this.text = text;
     }
 

Modified: activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=731839&r1=731838&r2=731839&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++ activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Mon Jan  5 21:44:58 2009
@@ -63,16 +63,16 @@
 
     @Override
     public void copyFrom(org.apache.camel.Message that) {
-        // for performance lets not copy the messageID if we are a JMS message
         boolean copyMessageId = true;
         if (that instanceof JmsMessage) {
             JmsMessage thatMessage = (JmsMessage) that;
             this.jmsMessage = thatMessage.jmsMessage;
             if (this.jmsMessage != null) {
+                // for performance lets not copy the messageID if we are a JMS message
                 copyMessageId = false;
             }
         }
-        if (!copyMessageId) {
+        if (copyMessageId) {
             setMessageId(that.getMessageId());
         }
         setBody(that.getBody());



Mime
View raw message