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 2008/11/10 17:55:05 UTC

svn commit: r712697 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java

Author: davsclaus
Date: Mon Nov 10 08:55:04 2008
New Revision: 712697

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

........
  r712692 | davsclaus | 2008-11-10 17:48:18 +0100 (ma, 10 nov 2008) | 1 line
  
  CAMEL-1070: hasAttachments() must also init
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 10 08:55:04 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=712697&r1=712696&r2=712697&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java Mon Nov 10 08:55:04 2008
@@ -160,6 +160,9 @@
     }
 
     public boolean hasAttachments() {
+        if (attachments == null) {
+            attachments = createAttachments();
+        }
         return this.attachments != null && this.attachments.size() > 0;
     }