[pull] master from jboss-javassist:master

src/main/javassist/SerialVersionUID.java

@@ -93,7 +93,9 @@ public static long calculateDefault(CtClass clazz)
             CtMethod[] methods = clazz.getDeclaredMethods();
 
             // class modifiers.
-            int classMods = clazz.getModifiers();
+            int classMods = clazz.getModifiers()
+                           & (Modifier.PUBLIC | Modifier.FINAL
+                              | Modifier.INTERFACE | Modifier.ABSTRACT);
             if ((classMods & Modifier.INTERFACE) != 0)
                 if (methods.length > 0)
                     classMods = classMods | Modifier.ABSTRACT;

src/test/javassist/JvstTest.java

@@ -836,6 +836,7 @@ public void testCast() throws Exception {
     }
 
     static final long svUID = 6006955401253799668L;
+    static final long svUIDStaticInner = -5933347829989567997L;
 
     public void testSerialVUID() throws Exception {
         CtClass cc = sloader.get("test1.MySerializableClass");
@@ -844,6 +845,11 @@ public void testSerialVUID() throws Exception {
         cc.writeFile();
     }
 
+    public void testSerialVUIDStaticInner() throws Exception {
+        CtClass cc = sloader.get("test1.SerialVUIDOuter$Inner");
+        assertEquals(svUIDStaticInner, SerialVersionUID.calculateDefault(cc));
+    }
+
     public void testInvokeInt() throws Exception {
         CtClass cc = sloader.get("test1.InvokeInt");
         CtMethod m1 = cc.getDeclaredMethod("check");

src/test/test1/SerialVUIDOuter.java

@@ -0,0 +1,7 @@
+package test1;
+
+import java.io.Serializable;
+
+public class SerialVUIDOuter {
+    public static class Inner implements Serializable { }
+}