WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate …

…4.3.7
zhouxiaocao · Jan 21, 2015 · d9973fe · d9973fe
2 parents 0f44e11 + b888275
commit d9973fe
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
@@ -305,7 +305,18 @@ protected Method findBaseAccessor(Class clazz, Method accessor) {
             } catch (Exception ex) {
                 LOG.debug(ex.getMessage(), ex);
             }
-        } else {
+
+        //in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...
+        } else if(clazz.getName().contains("$$_jvst")){
+            try {
+                baseAccessor = Class.forName(
+                        clazz.getName().substring(0, clazz.getName().indexOf("_$$")))
+                        .getMethod(accessor.getName(), accessor.getParameterTypes());
+            } catch (Exception ex) {
+                LOG.debug(ex.getMessage(), ex);
+            }
+        }
+        else {
             return accessor;
         }
         return baseAccessor;