jruby · Jun 6, 2016 · Jun 6, 2016 · Jun 6, 2016 · Jun 6, 2016
diff --git a/core/src/main/java/org/jruby/java/proxies/ArrayJavaProxy.java b/core/src/main/java/org/jruby/java/proxies/ArrayJavaProxy.java
@@ -66,15 +66,12 @@ static ArrayJavaProxy newArray(final Ruby runtime, final Class<?> elementType, f
         return new ArrayJavaProxy(runtime, Java.getProxyClassForObject(runtime, array), array);
     }
 
-    public JavaArray getJavaArray() {
-        JavaArray javaArray = (JavaArray) dataGetStruct();
-
-        if (javaArray == null) {
-            javaArray = new JavaArray(getRuntime(), getObject());
-            dataWrapStruct(javaArray);
-        }
+    protected JavaArray asJavaObject(final Object array) {
+        return new JavaArray(getRuntime(), array);
+    }
 
-        return javaArray;
+    public final JavaArray getJavaArray() {
+        return (JavaArray) dataGetStruct();
     }
 
     @JRubyMethod(name = {"length", "size"})

diff --git a/core/src/main/java/org/jruby/java/proxies/JavaProxy.java b/core/src/main/java/org/jruby/java/proxies/JavaProxy.java
@@ -80,26 +80,20 @@ public static RubyClass createJavaProxy(ThreadContext context) {
     }
 
     @Override
-    public Object dataGetStruct() {
-        return getJavaObject();
+    public final Object dataGetStruct() {
+        if (javaObject == null) {
+            javaObject = asJavaObject(object);
+        }
+        return javaObject;
     }
 
     @Override
-    public void dataWrapStruct(Object object) {
+    public final void dataWrapStruct(Object object) {
         this.javaObject = (JavaObject) object;
         this.object = javaObject.getValue();
     }
 
     public final Object getObject() {
-        // FIXME: Added this because marshal_spec seemed to reconstitute objects without calling dataWrapStruct
-        // this resulted in object being null after unmarshalling...
-        if (object == null) {
-            if (javaObject == null) {
-                throw getRuntime().newRuntimeError("Java wrapper with no contents: " + this.getMetaClass().getName());
-            } else {
-                object = javaObject.getValue();
-            }
-        }
         return object;
     }
 
@@ -109,15 +103,12 @@ public void setObject(Object object) {
 
     public Object unwrap() { return getObject(); }
 
-    private JavaObject getJavaObject() {
-        if (javaObject == null) {
-            javaObject = JavaObject.wrap(getRuntime(), object);
-        }
-        return javaObject;
+    protected JavaObject asJavaObject(final Object object) {
+        return JavaObject.wrap(getRuntime(), object);
     }
 
     @Override
-    public Class getJavaClass() {
+    public Class<?> getJavaClass() {
         return getObject().getClass();
     }
 
@@ -190,7 +181,7 @@ protected Object cloneObject() {
      * Create a name/newname map of fields to be exposed as methods.
      */
     private static Map<String, String> getFieldListFromArgs(final IRubyObject[] args) {
-        final Map<String, String> map = new HashMap<String, String>();
+        final HashMap<String, String> map = new HashMap<>(args.length, 1);
         // Get map of all fields we want to define.
         for (int i = 0; i < args.length; i++) {
             final IRubyObject arg = args[i];

diff --git a/core/src/main/java/org/jruby/runtime/ObjectSpace.java b/core/src/main/java/org/jruby/runtime/ObjectSpace.java
@@ -32,9 +32,12 @@
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
-import java.util.*;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
@@ -52,15 +55,15 @@
  * for now, this may be acceptable.
  */
 public class ObjectSpace {
-    private final ReferenceQueue<Object> deadReferences = new ReferenceQueue<Object>();
-    private final ReferenceQueue<ObjectGroup> objectGroupReferenceQueue = new ReferenceQueue<ObjectGroup>();
+    private final ReferenceQueue<Object> deadReferences = new ReferenceQueue<>();
+    private final ReferenceQueue<ObjectGroup> objectGroupReferenceQueue = new ReferenceQueue<>();
     private WeakReferenceListNode top;
 
     private ReferenceQueue deadIdentityReferences = new ReferenceQueue();
-    private final Map identities = new HashMap();
-    private final Map identitiesByObject = new WeakIdentityHashMap();
+    private final Map<Long, IdReference> identities = new HashMap<>(64);
+    private final Map<IRubyObject, Long> identitiesByObject = new WeakIdentityHashMap(64);
     private static final AtomicLong maxId = new AtomicLong(1000);
-    private final ThreadLocal<Reference<ObjectGroup>> currentObjectGroup = new ThreadLocal<Reference<ObjectGroup>>();
+    private final ThreadLocal<Reference<ObjectGroup>> currentObjectGroup = new ThreadLocal<>();
     private Reference<GroupSweeper> groupSweeperReference;
 
     public void registerObjectId(long id, IRubyObject object) {
@@ -75,10 +78,10 @@ public static long calculateObjectId(Object object) {
         // Fixnums get all the odd IDs, so we use identityHashCode * 2
         return maxId.getAndIncrement() * 2;
     }
-    
+
     public long createAndRegisterObjectId(IRubyObject rubyObject) {
         synchronized (identities) {
-            Long longId = (Long) identitiesByObject.get(rubyObject);
+            Long longId = identitiesByObject.get(rubyObject);
             if (longId == null) {
                 longId = createId(rubyObject);
             }
@@ -95,36 +98,37 @@ private long createId(IRubyObject object) {
     public IRubyObject id2ref(long id) {
         synchronized (identities) {
             cleanIdentities();
-            IdReference reference = (IdReference) identities.get(Long.valueOf(id));
+            IdReference reference = identities.get(id);
             if (reference == null) {
                 return null;
             }
-            return (IRubyObject) reference.get();
+            return reference.get();
         }
     }
 
     private void cleanIdentities() {
         IdReference ref;
-        while ((ref = (IdReference) deadIdentityReferences.poll()) != null)
-            identities.remove(Long.valueOf(ref.id()));
+        while ((ref = (IdReference) deadIdentityReferences.poll()) != null) {
+            identities.remove(ref.id);
+        }
     }
 
     @Deprecated
     public long idOf(IRubyObject rubyObject) {
         return createAndRegisterObjectId(rubyObject);
     }
-    
+
     public void addFinalizer(IRubyObject object, IRubyObject proc) {
         object.addFinalizer(proc);
     }
-    
+
     public void removeFinalizers(long id) {
         IRubyObject object = id2ref(id);
         if (object != null) {
             object.removeFinalizers();
         }
     }
-    
+
     public void add(IRubyObject object) {
         if (true && object.getMetaClass() != null && !(object instanceof JavaProxy)) {
             // If the object is already frozen when we encounter it, it's pre-frozen.
@@ -170,7 +174,7 @@ private synchronized void splitObjectGroups() {
     }
 
     public synchronized Iterator iterator(RubyModule rubyClass) {
-        final List<Reference<Object>> objList = new ArrayList<Reference<Object>>();
+        final ArrayList<Reference<Object>> objList = new ArrayList<>(64);
         WeakReferenceListNode current = top;
         while (current != null) {
             Object obj = current.get();
@@ -192,7 +196,7 @@ public synchronized Iterator iterator(RubyModule rubyClass) {
         }
 
         return new Iterator() {
-            private Iterator<Reference<Object>> iter = objList.iterator();
+            final Iterator<Reference<Object>> iter = objList.iterator();
 
             public boolean hasNext() {
                 throw new UnsupportedOperationException();
@@ -216,7 +220,7 @@ public void remove() {
 
     private void cleanup(ReferenceQueue<?> referenceQueue) {
         WeakReferenceListNode reference;
-        while ((reference = (WeakReferenceListNode)referenceQueue.poll()) != null) {
+        while ((reference = (WeakReferenceListNode) referenceQueue.poll()) != null) {
             reference.remove();
         }
     }
@@ -246,17 +250,13 @@ private void remove() {
         }
     }
 
-    private static class IdReference extends WeakReference {
-        private final long id;
+    private static class IdReference extends WeakReference<IRubyObject> {
+        final long id;
 
-        public IdReference(IRubyObject object, long id, ReferenceQueue queue) {
+        IdReference(IRubyObject object, long id, ReferenceQueue queue) {
             super(object, queue);
             this.id = id;
         }
-
-        public long id() {
-            return id;
-        }
     }
 
     private ObjectGroup getObjectGroup() {

diff --git a/lib/ruby/stdlib/joda-time/joda-time/2.3/joda-time-2.3.jar b/lib/ruby/stdlib/joda-time/joda-time/2.3/joda-time-2.3.jar
diff --git a/lib/ruby/stdlib/joda-time/joda-time/maven-metadata-local.xml b/lib/ruby/stdlib/joda-time/joda-time/maven-metadata-local.xml