Author: veithen
Date: Tue Apr 19 06:47:27 2016
New Revision: 1739854
URL: http://svn.apache.org/viewvc?rev=1739854&view=rev
Log:
AXIS2-5760: Merge r1739343 and r1739826 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/FinalClass.java
- copied unchanged from r1739826,
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/FinalClass.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/util/UtilsTest.java
- copied unchanged from r1739826,
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/UtilsTest.java
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/util/Utils.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 06:47:27 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739346,1739348,1739815
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/util/Utils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=1739854&r1=1739853&r2=1739854&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/util/Utils.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/util/Utils.java
Tue Apr 19 06:47:27 2016
@@ -733,10 +733,9 @@ public class Utils {
final Class<?> serviceClass = Loader.loadClass(
classLoader,
((String) serviceClassParam.getValue()).trim());
- String className = ((String)
serviceClassParam.getValue()).trim();
- Class serviceObjectMaker = Loader.loadClass(classLoader,
className);
- if (serviceObjectMaker.getModifiers() != Modifier.PUBLIC) {
- throw new AxisFault("Service class " + className +
+ int mod = serviceClass.getModifiers();
+ if (!Modifier.isPublic(mod) || Modifier.isAbstract(mod) ||
Modifier.isInterface(mod)) {
+ throw new AxisFault("Service class " +
serviceClass.getName() +
" must have public as access
Modifier");
}
return
org.apache.axis2.java.security.AccessController.doPrivileged(
