svn commit: r1453812 - in /camel/branches/camel-2.9.x: ./ camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java

[ningjiang]

Author: ningjiang
Date: Thu Mar  7 12:31:52 2013
New Revision: 1453812

URL: http://svn.apache.org/r1453812
Log:
Merged revisions 1453804 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

........
  r1453804 | ningjiang | 2013-03-07 20:20:48 +0800 (Thu, 07 Mar 2013) | 1 line
  
  CAMEL-6135 Fixed the compiled error of CompositeRegistryTest
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/branches/camel-2.10.x:r1453804

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

Modified: 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java?rev=1453812&r1=1453811&r2=1453812&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
 Thu Mar  7 12:31:52 2013
@@ -38,7 +38,7 @@ public class CompositeRegistryTest {
     
     @Test
     public void testGetNameAndType() throws Exception {
-        Object result = registry.lookupByNameAndType("name", String.class);
+        Object result = registry.lookup("name", String.class);
         assertNotNull(result);
         assertEquals("Get a wrong result", result, "12");