Merge branch 'master' into truffle-head

jruby · Jun 30, 2016 · 671d3f5 · 671d3f5
2 parents d232406 + 6a4ac4a
commit 671d3f5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java b/core/src/main/java/org/jruby/javasupport/JavaSupportImpl.java
@@ -403,14 +403,14 @@ public Map<Set<?>, JavaProxyClass> getJavaProxyClassCache() {
     private final Map<ProxyClassKey, JavaProxyClass> javaProxyClasses = new HashMap<>();
 
     @Override
-    final JavaProxyClass fetchJavaProxyClass(ProxyClassKey classKey) {
+    final protected JavaProxyClass fetchJavaProxyClass(ProxyClassKey classKey) {
         synchronized (javaProxyClasses) {
             return javaProxyClasses.get(classKey);
         }
     }
 
     @Override
-    final JavaProxyClass saveJavaProxyClass(ProxyClassKey classKey, JavaProxyClass klass) {
+    final protected JavaProxyClass saveJavaProxyClass(ProxyClassKey classKey, JavaProxyClass klass) {
         synchronized (javaProxyClasses) {
             JavaProxyClass existing = javaProxyClasses.get(classKey);
             if ( existing != null ) return existing;