svn commit: r712179 - in /activemq/camel/trunk/components: camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java

[janstey]

Author: janstey
Date: Fri Nov  7 08:06:59 2008
New Revision: 712179

URL: http://svn.apache.org/viewvc?rev=712179&view=rev
Log:
Fix up broken build

Modified:
    
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
    
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java

Modified: 
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java?rev=712179&r1=712178&r2=712179&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
 Fri Nov  7 08:06:59 2008
@@ -23,7 +23,7 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
-import org.apache.camel.converter.ObjectConverter;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.impl.DefaultProducer;
 
 import org.springframework.orm.jpa.JpaCallback;
@@ -48,7 +48,7 @@
         if (values != null) {
             template.execute(new JpaCallback() {
                 public Object doInJpa(EntityManager entityManager) throws 
PersistenceException {
-                    Iterator iter = ObjectConverter.iterator(values);
+                    Iterator iter = ObjectHelper.createIterator(values);
                     while (iter.hasNext()) {
                         Object value = iter.next();
                         entityManager.persist(value);

Modified: 
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=712179&r1=712178&r2=712179&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
 (original)
+++ 
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
 Fri Nov  7 08:06:59 2008
@@ -37,6 +37,7 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.converter.ObjectConverter;
 import org.apache.camel.impl.DefaultHeaderFilterStrategy;
 import org.apache.camel.spi.HeaderFilterStrategy;
@@ -131,7 +132,7 @@
 
                     // Mail messages can repeat the same header...
                     if (ObjectConverter.isCollection(headerValue)) {
-                        Iterator iter = ObjectConverter.iterator(headerValue);
+                        Iterator iter = 
ObjectHelper.createIterator(headerValue);
                         while (iter.hasNext()) {
                             Object value = iter.next();
                             mimeMessage.addHeader(headerName, 
asString(exchange, value));
@@ -154,7 +155,7 @@
             if (headerValue != null && isRecipientHeader(headerName)) {
                 // special handling of recipients
                 if (ObjectConverter.isCollection(headerValue)) {
-                    Iterator iter = ObjectConverter.iterator(headerValue);
+                    Iterator iter = ObjectHelper.createIterator(headerValue);
                     while (iter.hasNext()) {
                         Object recipient = iter.next();
                         appendRecipientToMimeMessage(mimeMessage, headerName, 
asString(exchange, recipient));