7 files changed, 116 insertions, 143 deletions

diff --git a/src/jogl/native/GLContext.c b/src/jogl/native/GLContext.c
index f10d0e421..9be9f82af 100644
--- a/src/jogl/native/GLContext.c
+++ b/src/jogl/native/GLContext.c
@@ -19,7 +19,7 @@ Java_jogamp_opengl_GLContextImpl_glGetStringInt(JNIEnv *env, jclass _unused, jin
   assert(ptr_glGetString != NULL);
   _res = (* ptr_glGetString) ((unsigned int) name);
   if (NULL == _res) return NULL;
-  return (*env)->NewStringUTF(env, _res);
+  return (*env)->NewStringUTF(env, (const char *)_res);
 }
 
 /*
diff --git a/src/jogl/native/GLDebugMessageHandler.c b/src/jogl/native/GLDebugMessageHandler.c
index 2e9d6033a..0aa7a01e7 100644
--- a/src/jogl/native/GLDebugMessageHandler.c
+++ b/src/jogl/native/GLDebugMessageHandler.c
@@ -49,8 +49,6 @@ JNIEXPORT jboolean JNICALL Java_jogamp_opengl_GLDebugMessageHandler_initIDs0
 }
 
 typedef struct {
-    JavaVM *vm;
-    int version;
     jobject obj;
     int extType;
 } DebugHandlerType;
@@ -60,39 +58,21 @@ typedef struct {
 static void GLDebugMessageARBCallback(GLenum source, GLenum type, GLuint id, GLenum severity, 
                                       GLsizei length, const GLchar *message, GLvoid *userParam) {
     DebugHandlerType * handle = (DebugHandlerType*) (intptr_t) userParam;
-    JavaVM *vm = handle->vm;
-    int version = handle->version;
     jobject obj = handle->obj;
-    JNIEnv *curEnv = NULL;
-    JNIEnv *newEnv = NULL;
-    int envRes ;
-    DBG_PRINT("GLDebugMessageARBCallback: 00 - %s, vm %p, version 0x%X, jobject %p, extType %d\n", 
-        message, handle->vm, handle->version, (void*)handle->obj, handle->extType);
-
-    // retrieve this thread's JNIEnv curEnv - or detect it's detached
-    envRes = (*vm)->GetEnv(vm, (void **) &curEnv, version) ;
-    DBG_PRINT("GLDebugMessageARBCallback: 01 - JVM Env: curEnv %p, res 0x%X\n", curEnv, envRes);
-    if( JNI_EDETACHED == envRes ) {
-        // detached thread - attach to JVM
-        if( JNI_OK != ( envRes = (*vm)->AttachCurrentThread(vm, (void**) &newEnv, NULL) ) ) {
-            fprintf(stderr, "GLDebugMessageARBCallback: can't attach thread: %d\n", envRes);
-            return;
-        }
-        curEnv = newEnv;
-        DBG_PRINT("GLDebugMessageARBCallback: 02 - attached .. \n");
-    } else if( JNI_OK != envRes ) {
-        // oops ..
-        fprintf(stderr, "GLDebugMessageARBCallback: can't GetEnv: %d\n", envRes);
+    JNIEnv *env = NULL;
+    int shallBeDetached ;
+    DBG_PRINT("GLDebugMessageARBCallback: 00 - %s, jobject %p, extType %d\n", message, (void*)handle->obj, handle->extType);
+
+    env = JoglCommon_GetJNIEnv (1 /* asDaemon */, &shallBeDetached);
+    if( NULL == env ) {
+        DBG_PRINT("GLDebugMessageARBCallback: Null JNIEnv\n");
         return;
     }
-    (*curEnv)->CallVoidMethod(curEnv, obj, glDebugMessageARB, 
+    (*env)->CallVoidMethod(env, obj, glDebugMessageARB, 
                               (jint) source, (jint) type, (jint) id, (jint) severity, 
-                              (*curEnv)->NewStringUTF(curEnv, message));
-    if( NULL != newEnv ) {
-        // detached attached thread
-        (*vm)->DetachCurrentThread(vm);
-        DBG_PRINT("GLDebugMessageARBCallback: 04 - detached .. \n");
-    }
+                              (*env)->NewStringUTF(env, message));
+    // detaching thread not required - daemon
+    // JoglCommon_ReleaseJNIEnv(shallBeDetached);
     DBG_PRINT("GLDebugMessageARBCallback: 0X\n");
     /**
      * On Java 32bit on 64bit Windows and w/ GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB disables,
@@ -104,39 +84,21 @@ static void GLDebugMessageARBCallback(GLenum source, GLenum type, GLuint id, GLe
 static void GLDebugMessageAMDCallback(GLuint id, GLenum category, GLenum severity, 
                                       GLsizei length, const GLchar *message, GLvoid *userParam) {
     DebugHandlerType * handle = (DebugHandlerType*) (intptr_t) userParam;
-    JavaVM *vm = handle->vm;
-    int version = handle->version;
     jobject obj = handle->obj;
-    JNIEnv *curEnv = NULL;
-    JNIEnv *newEnv = NULL;
-    int envRes ;
-    DBG_PRINT("GLDebugMessageAMDCallback: 00 - %s, vm %p, version 0x%X, jobject %p, extType %d\n", 
-        message, handle->vm, handle->version, (void*)handle->obj, handle->extType);
-
-    // retrieve this thread's JNIEnv curEnv - or detect it's detached
-    envRes = (*vm)->GetEnv(vm, (void **) &curEnv, version) ;
-    DBG_PRINT("GLDebugMessageAMDCallback: 01 - JVM Env: curEnv %p, res 0x%X\n", curEnv, envRes);
-    if( JNI_EDETACHED == envRes ) {
-        // detached thread - attach to JVM
-        if( JNI_OK != ( envRes = (*vm)->AttachCurrentThread(vm, (void**) &newEnv, NULL) ) ) {
-            fprintf(stderr, "GLDebugMessageAMDCallback: can't attach thread: %d\n", envRes);
-            return;
-        }
-        curEnv = newEnv;
-        DBG_PRINT("GLDebugMessageAMDCallback: 02 - attached .. \n");
-    } else if( JNI_OK != envRes ) {
-        // oops ..
-        fprintf(stderr, "GLDebugMessageAMDCallback: can't GetEnv: %d\n", envRes);
+    JNIEnv *env = NULL;
+    int shallBeDetached ;
+    DBG_PRINT("GLDebugMessageAMDCallback: 00 - %s, jobject %p, extType %d\n", message, (void*)handle->obj, handle->extType);
+
+    env = JoglCommon_GetJNIEnv (1 /* asDaemon */, &shallBeDetached);
+    if( NULL == env ) {
+        DBG_PRINT("GLDebugMessageARBCallback: Null JNIEnv\n");
         return;
     }
-    (*curEnv)->CallVoidMethod(curEnv, obj, glDebugMessageAMD, 
+    (*env)->CallVoidMethod(env, obj, glDebugMessageAMD, 
                               (jint) id, (jint) category, (jint) severity, 
-                              (*curEnv)->NewStringUTF(curEnv, message));
-    if( NULL != newEnv ) {
-        // detached attached thread
-        (*vm)->DetachCurrentThread(vm);
-        DBG_PRINT("GLDebugMessageAMDCallback: 04 - detached .. \n");
-    }
+                              (*env)->NewStringUTF(env, message));
+    // detached attached thread not required - daemon
+    // JoglCommon_ReleaseJNIEnv(shallBeDetached);
     DBG_PRINT("GLDebugMessageAMDCallback: 0X\n");
     /**
      * On Java 32bit on 64bit Windows,
@@ -153,18 +115,10 @@ static void GLDebugMessageAMDCallback(GLuint id, GLenum category, GLenum severit
 JNIEXPORT jlong JNICALL Java_jogamp_opengl_GLDebugMessageHandler_register0
   (JNIEnv *env, jobject obj, jlong procAddress, jint extType)
 {
-    JavaVM *vm;
     DebugHandlerType * handle = malloc(sizeof(DebugHandlerType));
-    if(0 != (*env)->GetJavaVM(env, &vm)) {
-        vm = NULL;
-        JoglCommon_throwNewRuntimeException(env, "GetJavaVM failed");
-    }
-    handle->vm = vm;
-    handle->version = (*env)->GetVersion(env);
     handle->obj = (*env)->NewGlobalRef(env, obj);
     handle->extType = extType;
-    DBG_PRINT("GLDebugMessageHandler.register0: vm %p, version 0x%X, jobject %p, extType %d\n", 
-        handle->vm, handle->version, (void*)handle->obj, handle->extType);
+    DBG_PRINT("GLDebugMessageHandler.register0: jobject %p, extType %d\n", (void*)handle->obj, handle->extType);
 
     if(jogamp_opengl_GLDebugMessageHandler_EXT_ARB == extType) {
         _local_PFNGLDEBUGMESSAGECALLBACKARBPROC ptr_glDebugMessageCallbackARB;
@@ -191,8 +145,7 @@ JNIEXPORT void JNICALL Java_jogamp_opengl_GLDebugMessageHandler_unregister0
 {
     DebugHandlerType * handle = (DebugHandlerType*) (intptr_t) jhandle;
 
-    DBG_PRINT("GLDebugMessageHandler.unregister0: vm %p, version 0x%X, jobject %p, extType %d\n", 
-        handle->vm, handle->version, (void*)handle->obj, handle->extType);
+    DBG_PRINT("GLDebugMessageHandler.unregister0: jobject %p, extType %d\n", (void*)handle->obj, handle->extType);
 
     if(JNI_FALSE == (*env)->IsSameObject(env, obj, handle->obj)) {
         JoglCommon_throwNewRuntimeException(env, "wrong handle (obj doesn't match)");
diff --git a/src/jogl/native/JoglCommon.c b/src/jogl/native/JoglCommon.c
index 4170b13ec..e9984ada2 100644
--- a/src/jogl/native/JoglCommon.c
+++ b/src/jogl/native/JoglCommon.c
@@ -11,42 +11,38 @@ static JavaVM *_jvmHandle = NULL;
 static int _jvmVersion = 0;
 
 void JoglCommon_init(JNIEnv *env) {
-    if(NULL==runtimeExceptionClz) {
+    if(NULL==_jvmHandle) {
+        if(0 != (*env)->GetJavaVM(env, &_jvmHandle)) {
+            JoglCommon_FatalError(env, "JOGL: Can't fetch JavaVM handle");
+        } else {
+            _jvmVersion = (*env)->GetVersion(env);
+        }
         jclass c = (*env)->FindClass(env, ClazzNameRuntimeException);
         if(NULL==c) {
-            JoglCommon_FatalError(env, "JOGL: can't find %s", ClazzNameRuntimeException);
+            JoglCommon_FatalError(env, "JOGL: Can't find %s", ClazzNameRuntimeException);
         }
         runtimeExceptionClz = (jclass)(*env)->NewGlobalRef(env, c);
         (*env)->DeleteLocalRef(env, c);
         if(NULL==runtimeExceptionClz) {
-            JoglCommon_FatalError(env, "JOGL: can't use %s", ClazzNameRuntimeException);
+            JoglCommon_FatalError(env, "JOGL: Can't use %s", ClazzNameRuntimeException);
         }
     }
-    if(0 != (*env)->GetJavaVM(env, &_jvmHandle)) {
-        JoglCommon_FatalError(env, "JOGL: can't fetch JavaVM handle");
-    } else {
-        _jvmVersion = (*env)->GetVersion(env);
-    }
 }
 
 void JoglCommon_FatalError(JNIEnv *env, const char* msg, ...)
 {
     char buffer[512];
     va_list ap;
-    int shallBeDetached = 0;
-
-    if(NULL == env) {
-        env = JoglCommon_GetJNIEnv (&shallBeDetached);
-    }
 
-    va_start(ap, msg);
-    vsnprintf(buffer, sizeof(buffer), msg, ap);
-    va_end(ap);
+    if( NULL != msg ) {
+        va_start(ap, msg);
+        vsnprintf(buffer, sizeof(buffer), msg, ap);
+        va_end(ap);
 
-    fprintf(stderr, "%s\n", buffer);
-    if(NULL != env) {
-        (*env)->FatalError(env, buffer);
-        JoglCommon_ReleaseJNIEnv (shallBeDetached);
+        fprintf(stderr, "%s\n", buffer);
+        if(NULL != env) {
+            (*env)->FatalError(env, buffer);
+        }
     }
 }
 
@@ -54,48 +50,42 @@ void JoglCommon_throwNewRuntimeException(JNIEnv *env, const char* msg, ...)
 {
     char buffer[512];
     va_list ap;
-    int shallBeDetached = 0;
 
-    if(NULL == env) {
-        env = JoglCommon_GetJNIEnv (&shallBeDetached);
+    if(NULL==_jvmHandle) {
+        JoglCommon_FatalError(env, "JOGL: NULL JVM handle, call JoglCommon_init 1st\n");
+        return;
     }
 
-    va_start(ap, msg);
-    vsnprintf(buffer, sizeof(buffer), msg, ap);
-    va_end(ap);
+    if( NULL != msg ) {
+        va_start(ap, msg);
+        vsnprintf(buffer, sizeof(buffer), msg, ap);
+        va_end(ap);
 
-    if(NULL != env) {
-        (*env)->ThrowNew(env, runtimeExceptionClz, buffer);
-        JoglCommon_ReleaseJNIEnv (shallBeDetached);
+        if(NULL != env) {
+            (*env)->ThrowNew(env, runtimeExceptionClz, buffer);
+        }
     }
 }
 
-JavaVM *JoglCommon_GetJVMHandle() {
-    return _jvmHandle;
-}
-
-int JoglCommon_GetJVMVersion() {
-    return _jvmVersion;
-}
-
 jchar* JoglCommon_GetNullTerminatedStringChars(JNIEnv* env, jstring str)
 {
     jchar* strChars = NULL;
-    strChars = calloc((*env)->GetStringLength(env, str) + 1, sizeof(jchar));
-    if (strChars != NULL) {
-        (*env)->GetStringRegion(env, str, 0, (*env)->GetStringLength(env, str), strChars);
+    if( NULL != env && 0 != str ) {
+        strChars = calloc((*env)->GetStringLength(env, str) + 1, sizeof(jchar));
+        if (strChars != NULL) {
+            (*env)->GetStringRegion(env, str, 0, (*env)->GetStringLength(env, str), strChars);
+        }
     }
     return strChars;
 }
 
-JNIEnv* JoglCommon_GetJNIEnv (int * shallBeDetached)
-{
+JNIEnv* JoglCommon_GetJNIEnv (int asDaemon, int * shallBeDetached) {
     JNIEnv* curEnv = NULL;
     JNIEnv* newEnv = NULL;
     int envRes;
 
-    if(NULL == _jvmHandle) {
-        fprintf(stderr, "JOGL: No JavaVM handle registered, call JoglCommon_init(..) 1st");
+    if(NULL==_jvmHandle) {
+        fprintf(stderr, "JOGL GetJNIEnv: NULL JVM handle, call JoglCommon_init 1st\n");
         return NULL;
     }
 
@@ -103,18 +93,23 @@ JNIEnv* JoglCommon_GetJNIEnv (int * shallBeDetached)
     envRes = (*_jvmHandle)->GetEnv(_jvmHandle, (void **) &curEnv, _jvmVersion) ;
     if( JNI_EDETACHED == envRes ) {
         // detached thread - attach to JVM
-        if( JNI_OK != ( envRes = (*_jvmHandle)->AttachCurrentThread(_jvmHandle, (void**) &newEnv, NULL) ) ) {
-            fprintf(stderr, "JNIEnv: can't attach thread: %d\n", envRes);
+        if( asDaemon ) {
+            envRes = (*_jvmHandle)->AttachCurrentThreadAsDaemon(_jvmHandle, (void**) &newEnv, NULL);
+        } else {
+            envRes = (*_jvmHandle)->AttachCurrentThread(_jvmHandle, (void**) &newEnv, NULL);
+        }
+        if( JNI_OK != envRes ) {
+            fprintf(stderr, "JOGL GetJNIEnv: Can't attach thread: %d\n", envRes);
             return NULL;
         }
         curEnv = newEnv;
     } else if( JNI_OK != envRes ) {
         // oops ..
-        fprintf(stderr, "can't GetEnv: %d\n", envRes);
+        fprintf(stderr, "JOGL GetJNIEnv: Can't GetEnv: %d\n", envRes);
         return NULL;
     }
     if (curEnv==NULL) {
-        fprintf(stderr, "env is NULL\n");
+        fprintf(stderr, "JOGL GetJNIEnv: env is NULL\n");
         return NULL;
     }
     *shallBeDetached = NULL != newEnv;
@@ -123,10 +118,8 @@ JNIEnv* JoglCommon_GetJNIEnv (int * shallBeDetached)
 
 void JoglCommon_ReleaseJNIEnv (int shallBeDetached) {
     if(NULL == _jvmHandle) {
-        fprintf(stderr, "JOGL: No JavaVM handle registered, call JoglCommon_init(..) 1st");
-    }
-
-    if(shallBeDetached) {
+        fprintf(stderr, "JOGL ReleaseJNIEnv: No JavaVM handle registered, call JoglCommon_init(..) 1st");
+    } else if(shallBeDetached) {
         (*_jvmHandle)->DetachCurrentThread(_jvmHandle);
     }
 }
diff --git a/src/jogl/native/JoglCommon.h b/src/jogl/native/JoglCommon.h
index 023b4be03..2aeaf7d1d 100644
--- a/src/jogl/native/JoglCommon.h
+++ b/src/jogl/native/JoglCommon.h
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 
 #ifndef JOGL_COMMON_H
 #define JOGL_COMMON_H 1
@@ -7,29 +34,25 @@
 
 void JoglCommon_init(JNIEnv *env);
 
-/** Set by JoglCommon_init */
-JavaVM *JoglCommon_GetJVMHandle();
-
-/** Set by JoglCommon_init */
-int JoglCommon_GetJVMVersion();
-
 jchar* JoglCommon_GetNullTerminatedStringChars(JNIEnv* env, jstring str);
 
-/** env may be NULL, in which case JoglCommon_GetJNIEnv() is being used. */
 void JoglCommon_FatalError(JNIEnv *env, const char* msg, ...);
-
-/** env may be NULL, in which case JoglCommon_GetJNIEnv() is being used. */
 void JoglCommon_throwNewRuntimeException(JNIEnv *env, const char* msg, ...);
 
 /**
  *
- * 1) Store jvmHandle and jvmVersion is done by 'JoglCommon_init(JNIEnv*)'
- *    and internally used by 'JoglCommon_GetJNIEnv(..)' and 'JoglCommon_ReleaseJNIEnv(..)'.
+ * 1) Init static jvmHandle, jvmVersion and clazz references
+ *    from an early initialization call w/ valid 'JNIEnv * env'
+
+    JoglCommon_init(env);
+
  *
  * 2) Use current thread JNIEnv or attach current thread to JVM, generating new JNIEnv
  *
+
+    int asDaemon = 0;
     int shallBeDetached = 0;
-    JNIEnv* env = NewtCommon_GetJNIEnv(&shallBeDetached);
+    JNIEnv* env = JoglCommon_GetJNIEnv(asDaemon, &shallBeDetached);
     if(NULL==env) {
         DBG_PRINT("drawRect: null JNIEnv\n");
         return;
@@ -41,11 +64,13 @@ void JoglCommon_throwNewRuntimeException(JNIEnv *env, const char* msg, ...);
     .. your JNIEnv code here ..
 
  *
- * 4) Detach thread from JVM, if required
+ * 4) Detach thread from JVM if required, i.e. not attached as daemon!
+ *    Not recommended for recurring _daemon_ threads (performance)
  *
-    JoglCommon_ReleaseJNIEnv (shallBeDetached);
+    JoglCommon_ReleaseJNIEnv(shallBeDetached);
  */
-JNIEnv* JoglCommon_GetJNIEnv (int * shallBeDetached);
+JNIEnv* JoglCommon_GetJNIEnv (int asDaemon, int * shallBeDetached);
+
 void JoglCommon_ReleaseJNIEnv (int shallBeDetached);
 
 #endif
diff --git a/src/jogl/native/libav/ffmpeg_impl_template.c b/src/jogl/native/libav/ffmpeg_impl_template.c
index 44acfe46a..e86b2a542 100644
--- a/src/jogl/native/libav/ffmpeg_impl_template.c
+++ b/src/jogl/native/libav/ffmpeg_impl_template.c
@@ -1499,7 +1499,7 @@ JNIEXPORT jint JNICALL FF_FUNC(seek0)
     int64_t pts1 = (int64_t) (pos1 * (int64_t) time_base.den)
                            / (1000 * (int64_t) time_base.num);
     if(pAV->verbose) {
-        fprintf(stderr, "SEEK: vid %d, aid %d, pos0 %d, pos1 %d, pts: %"PRId64" -> %"PRId64"\n", pAV->vid, pAV->aid, pos0, pos1, pts0, pts1);
+        fprintf(stderr, "SEEK: vid %d, aid %d, pos0 %"PRId64", pos1 %d, pts: %"PRId64" -> %"PRId64"\n", pAV->vid, pAV->aid, pos0, pos1, pts0, pts1);
     }
     int flags = 0;
     if(pos1 < pos0) {
@@ -1508,7 +1508,7 @@ JNIEXPORT jint JNICALL FF_FUNC(seek0)
     int res = -2;
     if(HAS_FUNC(sp_av_seek_frame)) {
         if(pAV->verbose) {
-            fprintf(stderr, "SEEK.0: pre  : s %d / %"PRId64" -> t %d / %"PRId64"\n", pos0, pts0, pos1, pts1);
+            fprintf(stderr, "SEEK.0: pre  : s %"PRId64" / %"PRId64" -> t %d / %"PRId64"\n", pos0, pts0, pos1, pts1);
         }
         sp_av_seek_frame(pAV->pFormatCtx, streamID, pts1, flags);
     } else if(HAS_FUNC(sp_avformat_seek_file)) {
diff --git a/src/jogl/native/macosx/MacOSXWindowSystemInterface-calayer.m b/src/jogl/native/macosx/MacOSXWindowSystemInterface-calayer.m
index 75917d2dc..7ce8c58cf 100644
--- a/src/jogl/native/macosx/MacOSXWindowSystemInterface-calayer.m
+++ b/src/jogl/native/macosx/MacOSXWindowSystemInterface-calayer.m
@@ -578,6 +578,7 @@ static const GLfloat gl_verts[] = {
         quirks, dedicatedFramePosSet, dedicatedFrameSizeSet, dedicatedLayoutSet, self, texWidth, texHeight,
         lRect.origin.x, lRect.origin.y, lRect.size.width, lRect.size.height,
         dFrame.origin.x, dFrame.origin.y, dFrame.size.width, dFrame.size.height);
+    (void)lRect; // silence
     
     if( dedicatedFrameSet ) {
         [super setFrame: dedicatedFrame];
diff --git a/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c b/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c
index ec68a24aa..3166306ba 100644
--- a/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c
+++ b/src/jogl/native/openmax/jogamp_opengl_util_av_impl_OMXGLMediaPlayer.c
@@ -67,7 +67,7 @@ void OMXInstance_UpdateJavaAttributes(OMXToolBasicAV_t *pAV)
         return;
     }
     int shallBeDetached = 0;
-    JNIEnv  * env = JoglCommon_GetJNIEnv (&shallBeDetached); 
+    JNIEnv  * env = JoglCommon_GetJNIEnv (1 /* daemon */, &shallBeDetached); 
     if(NULL!=env) {
         (*env)->CallVoidMethod(env, (jobject)pAV->jni_instance, jni_mid_updateAttributes,
                                pAV->width, pAV->height, 
@@ -75,7 +75,8 @@ void OMXInstance_UpdateJavaAttributes(OMXToolBasicAV_t *pAV)
                                pAV->framerate, (uint32_t)(pAV->length*pAV->framerate), pAV->length,
                                (*env)->NewStringUTF(env, pAV->videoCodec),
                                (*env)->NewStringUTF(env, pAV->audioCodec) );
-        JoglCommon_ReleaseJNIEnv (shallBeDetached);
+        // detaching thread not required - daemon
+        // JoglCommon_ReleaseJNIEnv(shallBeDetached);
     }
 }