svn commit: r1460517 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/util/ camel-core/src/test/java/org/apache/camel/util/ camel-core/src/test/resources/org/apache/camel/util/

[ningjiang]

Author: ningjiang
Date: Mon Mar 25 03:23:24 2013
New Revision: 1460517

URL: http://svn.apache.org/r1460517
Log:
CAMEL-6204 fixed the issue that ObjectHelper cannot loadResources with leading /
Merged revisions 1460514 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1460514 | ningjiang | 2013-03-25 10:43:45 +0800 (Mon, 25 Mar 2013) | 1 line
  
  CAMEL-6204 fixed the issue that ObjectHelper cannot loadResources with 
leading /
........

Added:
    
camel/branches/camel-2.10.x/camel-core/src/test/resources/org/apache/camel/util/ObjectHelperResourceTestFile.properties
      - copied unchanged from r1460514, 
camel/trunk/camel-core/src/test/resources/org/apache/camel/util/ObjectHelperResourceTestFile.properties
Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1460514

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

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1460517&r1=1460516&r2=1460517&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 Mon Mar 25 03:23:24 2013
@@ -57,6 +57,7 @@ import org.apache.camel.WrappedFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A number of useful helper methods for working with Objects
  *
@@ -879,6 +880,9 @@ public final class ObjectHelper {
         if (in == null) {
             in = 
ObjectHelper.class.getClassLoader().getResourceAsStream(resolvedName);
         }
+        if (in == null) {
+            in = ObjectHelper.class.getResourceAsStream(resolvedName);
+        }
 
         return in;
     }
@@ -901,6 +905,9 @@ public final class ObjectHelper {
         if (url == null) {
             url = 
ObjectHelper.class.getClassLoader().getResource(resolvedName);
         }
+        if (url == null) {
+            url = ObjectHelper.class.getResource(resolvedName);
+        }
 
         return url;
     }

Modified: 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java?rev=1460517&r1=1460516&r2=1460517&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
 Mon Mar 25 03:23:24 2013
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.util;
 
+import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,11 +40,28 @@ import org.apache.camel.component.bean.M
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultMessage;
 
+
 /**
  * @version 
  */
 public class ObjectHelperTest extends TestCase {
 
+    public void testLoadResourceAsStream() {
+        InputStream res1 = 
ObjectHelper.loadResourceAsStream("org/apache/camel/util/ObjectHelperResourceTestFile.properties");
+        InputStream res2 = 
ObjectHelper.loadResourceAsStream("/org/apache/camel/util/ObjectHelperResourceTestFile.properties");
+
+        assertNotNull("Cannot load resource without leading \"/\"", res1);
+        assertNotNull("Cannot load resource with leading \"/\"", res2);
+    }
+
+    public void testLoadResource() {
+        URL url1 = 
ObjectHelper.loadResourceAsURL("org/apache/camel/util/ObjectHelperResourceTestFile.properties");
+        URL url2 = 
ObjectHelper.loadResourceAsURL("/org/apache/camel/util/ObjectHelperResourceTestFile.properties");
+
+        assertNotNull("Cannot load resource without leading \"/\"", url1);
+        assertNotNull("Cannot load resource with leading \"/\"", url2);
+    }
+
     public void testRemoveInitialCharacters() throws Exception {
         assertEquals(ObjectHelper.removeStartingCharacters("foo", '/'), "foo");
         assertEquals(ObjectHelper.removeStartingCharacters("/foo", '/'), 
"foo");