--- old/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java	2015-12-29 20:44:25.000000000 +0300
+++ new/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java	2015-12-29 20:44:25.000000000 +0300
@@ -74,6 +74,7 @@
             pPeerData = pView.getAWTView();
             isOpaque = pView.isOpaque();
         }
+        CGLGraphicsConfig.refPConfigInfo(pConfigInfo);
         initOps(pConfigInfo, pPeerData, 0, 0, 0, isOpaque);
     }
 
@@ -90,6 +91,7 @@
             layerPtr = layer.getPointer();
             isOpaque = layer.isOpaque();
         }
+        CGLGraphicsConfig.refPConfigInfo(pConfigInfo);
         initOps(pConfigInfo, 0, layerPtr, 0, 0, isOpaque);
     }
 
@@ -405,4 +407,9 @@
             destroyCGLContext(ctx);
         }
     }
+
+    static void dispose(long pData, long pConfigInfo) {
+        OGLSurfaceData.dispose(pData, pConfigInfo);
+        CGLGraphicsConfig.deRefPConfigInfo(pConfigInfo);
+    }
 }