cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1332760 - /cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
Date Tue, 01 May 2012 17:31:15 GMT
Author: dkulp
Date: Tue May  1 17:31:14 2012
New Revision: 1332760

URL: http://svn.apache.org/viewvc?rev=1332760&view=rev
Log:
Forgot to resolve a conflict.

Modified:
    cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java

Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java?rev=1332760&r1=1332759&r2=1332760&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
Tue May  1 17:31:14 2012
@@ -126,9 +126,6 @@ public class ReflectionInvokationHandler
         boolean iterator() default false;
     }
     
-<<<<<<< HEAD:common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
-    private static class WrapperIterator implements Iterator {
-=======
     @Target(ElementType.PARAMETER)
     @Retention(RetentionPolicy.RUNTIME)
     public static @interface UnwrapParam {
@@ -137,7 +134,6 @@ public class ReflectionInvokationHandler
     }
     
     private static class WrapperIterator implements Iterator<Object> {
->>>>>>> ef63251... Add ability to unwrap a parameter into a real type.:api/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
         Class<?> cls;
         Iterator internal;
         public WrapperIterator(Class<?> c, Iterator it) {



Mime
View raw message