*** old/src/java.base/unix/native/libjli/java_md_solinux.c	Wed Apr  1 09:49:55 2015
--- new/src/java.base/unix/native/libjli/java_md_solinux.c	Wed Apr  1 09:49:54 2015

*** 886,896 ****
--- 886,896 ----
      }
  
      if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
        void * tmp;
        pthread_join(tid, &tmp);
!       rslt = (int)(intptr_t)tmp;
      } else {
       /*
        * Continue execution in current thread if for some reason (e.g. out of
        * memory/LWP)  a new thread can't be created. This will likely fail
        * later in continuation as JNI_CreateJavaVM needs to create quite a

*** 904,914 ****
--- 904,914 ----
      thread_t tid;
      long flags = 0;
      if (thr_create(NULL, stack_size, (void *(*)(void *))continuation, args, flags, &tid) == 0) {
        void * tmp;
        thr_join(tid, NULL, &tmp);
!       rslt = (int)(intptr_t)tmp;
      } else {
        /* See above. Continue in current thread if thr_create() failed */
        rslt = continuation(args);
      }
  #endif /* !__solaris__ */