3 files changed, 10 insertions, 7 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index ee9d36147..8bd3c4777 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -33,11 +33,10 @@ import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.common.util.JogampVersion;
 import java.util.jar.Manifest;
-import javax.media.nativewindow.AbstractGraphicsDevice;
 
 public class JoglVersion extends JogampVersion {
 
-    protected static JoglVersion jogampCommonVersionInfo;
+    protected static volatile JoglVersion jogampCommonVersionInfo;
 
     protected JoglVersion(String packageName, Manifest mf) {
         super(packageName, mf);
@@ -48,8 +47,7 @@ public class JoglVersion extends JogampVersion {
             synchronized(JoglVersion.class) {
                 if( null == jogampCommonVersionInfo ) {
                     final String packageName = "javax.media.opengl";
-                    final String fullClazzName = "javax.media.opengl.GL";
-                    final Manifest mf = VersionUtil.getManifest(JoglVersion.class.getClassLoader(), fullClazzName);
+                    final Manifest mf = VersionUtil.getManifest(JoglVersion.class.getClassLoader(), packageName);
                     jogampCommonVersionInfo = new JoglVersion(packageName, mf);
                 }
             }
@@ -57,8 +55,8 @@ public class JoglVersion extends JogampVersion {
         return jogampCommonVersionInfo;
     }
 
-    public StringBuffer toStringBuffer(GL gl, StringBuffer sb) {
-        sb = super.toStringBuffer(sb);
+    public StringBuffer toString(GL gl, StringBuffer sb) {
+        sb = super.toString(sb);
 
         getGLInfo(gl, sb);
         sb.append("-----------------------------------------------------------------------------------------------------");
@@ -68,7 +66,7 @@ public class JoglVersion extends JogampVersion {
     }
 
     public String toString(GL gl) {
-        return toStringBuffer(gl, null).toString();
+        return toString(gl, null).toString();
     }
 
     public static StringBuffer getGLInfo(GL gl, StringBuffer sb) {
@@ -99,6 +97,7 @@ public class JoglVersion extends JogampVersion {
     }
 
     public static void main(String args[]) {
+        System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(JoglVersion.getInstance());
     }
 }
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 02252ac33..dab0c0daa 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -40,6 +40,7 @@ package javax.media.opengl;
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.jvm.JVMUtil;
 import com.jogamp.common.util.ReflectionUtil;
+import com.jogamp.common.util.VersionUtil;
 import com.jogamp.nativewindow.NativeWindowVersion;
 import com.jogamp.opengl.impl.Debug;
 import com.jogamp.opengl.impl.GLDrawableFactoryImpl;
@@ -1172,6 +1173,7 @@ public class GLProfile {
         addedAnyProfile = addedAnyProfile || initProfilesForDevice(defaultEGLDevice);
 
         if(DEBUG) {
+            System.err.println(VersionUtil.getPlatformInfo());
             System.err.println(GlueGenVersion.getInstance());
             System.err.println(NativeWindowVersion.getInstance());
             System.err.print(JoglVersion.getInstance());
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index b20a4ff13..f2016a23c 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -41,6 +41,7 @@
 package javax.media.opengl.awt;
 
 import com.jogamp.common.GlueGenVersion;
+import com.jogamp.common.util.VersionUtil;
 import com.jogamp.nativewindow.NativeWindowVersion;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
@@ -792,6 +793,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable {
    * A most simple JOGL AWT test entry
    */
   public static void main(String args[]) {
+    System.err.println(VersionUtil.getPlatformInfo());
     System.err.println(GlueGenVersion.getInstance());
     System.err.println(NativeWindowVersion.getInstance());
     System.err.print(JoglVersion.getInstance());