You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/03/29 15:31:25 UTC
cxf git commit: [CXF-7291] Making sure
PackageUtils.getSharedPackageName ignores Proxy classes,
patch from Dennis Kieselhorst applied, This closes #247
Repository: cxf
Updated Branches:
refs/heads/master 11a1e4ef7 -> e0ed46f9f
[CXF-7291] Making sure PackageUtils.getSharedPackageName ignores Proxy classes, patch from Dennis Kieselhorst applied, This closes #247
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e0ed46f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0ed46f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0ed46f9
Branch: refs/heads/master
Commit: e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53
Parents: 11a1e4e
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Mar 29 16:31:09 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Mar 29 16:31:09 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/common/util/PackageUtils.java | 5 ++++-
.../org/apache/cxf/common/util/PackageUtilsTest.java | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0ed46f9/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index d40c3fa..4d7187c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -19,6 +19,7 @@
package org.apache.cxf.common.util;
+import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -56,7 +57,9 @@ public final class PackageUtils {
List<List<String>> lParts = new ArrayList<List<String>>(classes.size());
List<String> currentParts = new ArrayList<>();
for (Class<?> cls : classes) {
- lParts.add(StringUtils.getParts(getPackageName(cls), "\\."));
+ if (!Proxy.isProxyClass(cls)) {
+ lParts.add(StringUtils.getParts(getPackageName(cls), "\\."));
+ }
}
for (int i = 0; i < lParts.get(0).size(); i++) {
int j = 1;
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0ed46f9/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index fb8f279..3a797b6 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -20,11 +20,14 @@
package org.apache.cxf.common.util;
+import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collections;
+import org.apache.cxf.validation.BeanValidationProvider;
+import org.apache.cxf.validation.ValidationConfiguration;
import org.junit.Assert;
import org.junit.Test;
@@ -100,4 +103,14 @@ public class PackageUtilsTest extends Assert {
org.apache.cxf.configuration.spring.JAXBBeanFactory.class));
assertEquals("org.apache.cxf", packageName);
}
+ @Test
+ public void testSharedPackageNameIgnoreProxyClasses() {
+ // build any proxy object resulting in com.sun.proxy...
+ Object proxy = ProxyHelper.getProxy(BeanValidationProvider.class.getClassLoader(),
+ new Class[]{Serializable.class}, new ReflectionInvokationHandler(new ValidationConfiguration()));
+ String packageName = PackageUtils.getSharedPackageName(
+ Arrays.asList(proxy.getClass(), org.apache.cxf.bus.spring.BusApplicationContext.class,
+ org.apache.cxf.configuration.spring.JAXBBeanFactory.class));
+ assertEquals("org.apache.cxf", packageName);
+ }
}