[pkg-eucalyptus-commits] r320 - in mule/trunk/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-08-07 11:16:47 +0000 (Thu, 07 Aug 2014)
New Revision: 320

Added:
   mule/trunk/debian/patches/beanutils-compatibility.patch
Modified:
   mule/trunk/debian/changelog
   mule/trunk/debian/patches/series
Log:
Fixed the compatibility with libcommons-beanutils-java 1.9.x



Modified: mule/trunk/debian/changelog
===================================================================
--- mule/trunk/debian/changelog	2014-08-07 10:52:01 UTC (rev 319)
+++ mule/trunk/debian/changelog	2014-08-07 11:16:47 UTC (rev 320)
@@ -3,6 +3,7 @@
   * Team upload.
   * Removed the dependency on backport-util-concurrent
   * The build now stops on compilation failures
+  * Fixed the compatibility with libcommons-beanutils-java 1.9.x
   * debian/control:
     - Removed the JRE dependency on libmule-java-2.0
     - Removed the non existent build dependency on libjetty6-java

Added: mule/trunk/debian/patches/beanutils-compatibility.patch
===================================================================
--- mule/trunk/debian/patches/beanutils-compatibility.patch	                        (rev 0)
+++ mule/trunk/debian/patches/beanutils-compatibility.patch	2014-08-07 11:16:47 UTC (rev 320)
@@ -0,0 +1,14 @@
+Description: Fix the source compatibility with BeanUtils 1.9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/core/src/main/java/org/mule/transport/service/TransportFactory.java
++++ b/core/src/main/java/org/mule/transport/service/TransportFactory.java
+@@ -137,7 +137,7 @@
+             connector = createConnector(uri, muleContext);
+             try
+             {
+-                BeanUtils.populate(connector, uri.getParams());
++                BeanUtils.populate(connector, new java.util.HashMap(uri.getParams()));
+                 connector.setMuleContext(muleContext);
+                 muleContext.getRegistry().registerConnector(connector);
+             }

Modified: mule/trunk/debian/patches/series
===================================================================
--- mule/trunk/debian/patches/series	2014-08-07 10:52:01 UTC (rev 319)
+++ mule/trunk/debian/patches/series	2014-08-07 11:16:47 UTC (rev 320)
@@ -3,3 +3,4 @@
 add_stub_handlers.diff 
 remove_yourkit_support.diff
 drop-backport-util-concurrent.diff
+beanutils-compatibility.patch