/patches/openjdk/8012243-serial_regression.patch

https://bitbucket.org/Ringdingcoder/icedtea6 · Patch · 42 lines · 41 code · 1 blank · 0 comment · 0 complexity · 87495be6d04d835ee4867b8f3b0ff836 MD5 · raw file 

    

  1. # HG changeset patch
    2. 

  2. # User dfuchs
    3. 

  3. # Date 1367362161 -7200
    4. 

  4. # Node ID 7c75580b144fc3e7841e1b7fa7e4ae7efb67476e
    5. 

  5. # Parent  22decf80e0e833a8667f3e413da735b269d97fe6
    6. 

  6. 8012243: about 30% regression on specjvm2008.serial on 7u25 comparing 7u21
    7. 

  7. Reviewed-by: alanb, skoivu, smarks, mchung
    8. 

  8. 

  9. --- openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java
    10. 

  10. +++ openjdk/jdk/src/share/classes/java/io/ObjectStreamClass.java
    11. 

  11. @@ -266,9 +266,11 @@
    12. 

  12.          if (cl == null) {
    13. 

  13.              return null;
    14. 

  14.          }
    15. 

  15. -        Class<?> caller = Reflection.getCallerClass();
    16. 

  16. -        if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) {
    17. 

  17. -            ReflectUtil.checkPackageAccess(cl);
    18. 

  18. +        if (System.getSecurityManager() != null) {
    19. 

  19. +            Class<?> caller = Reflection.getCallerClass();
    20. 

  20. +            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) {
    21. 

  21. +                ReflectUtil.checkPackageAccess(cl);
    22. 

  22. +            }
    23. 

  23.          }
    24. 

  24.          return cl;
    25. 

  25.      }
    26. 

  26. --- openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java
    27. 

  27. +++ openjdk/jdk/src/share/classes/java/io/ObjectStreamField.java
    28. 

  28. @@ -162,9 +162,11 @@
    29. 

  29.       */
    30. 

  30.      @CallerSensitive
    31. 

  31.      public Class<?> getType() {
    32. 

  32. -        Class<?> caller = Reflection.getCallerClass();
    33. 

  33. -        if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
    34. 

  34. -            ReflectUtil.checkPackageAccess(type);
    35. 

  35. +        if (System.getSecurityManager() != null) {
    36. 

  36. +            Class<?> caller = Reflection.getCallerClass();
    37. 

  37. +            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
    38. 

  38. +                ReflectUtil.checkPackageAccess(type);
    39. 

  39. +            }
    40. 

  40.          }
    41. 

  41.          return type;
    42. 

  42.      }
    43.