src/share/native/java/util/zip/Deflater.c

rev 7736 : imported patch 8068230-Better-message-about-incompatible-zlib

*** 66,79 ****
  
      if (strm == 0) {
          JNU_ThrowOutOfMemoryError(env, 0);
          return jlong_zero;
      } else {
!         char *msg;
!         switch (deflateInit2(strm, level, Z_DEFLATED,
                               nowrap ? -MAX_WBITS : MAX_WBITS,
!                              DEF_MEM_LEVEL, strategy)) {
            case Z_OK:
              return ptr_to_jlong(strm);
            case Z_MEM_ERROR:
              free(strm);
              JNU_ThrowOutOfMemoryError(env, 0);
--- 66,80 ----
  
      if (strm == 0) {
          JNU_ThrowOutOfMemoryError(env, 0);
          return jlong_zero;
      } else {
!         const char *msg;
!         int ret = deflateInit2(strm, level, Z_DEFLATED,
                                 nowrap ? -MAX_WBITS : MAX_WBITS,
!                                DEF_MEM_LEVEL, strategy);
!         switch (ret) {
            case Z_OK:
              return ptr_to_jlong(strm);
            case Z_MEM_ERROR:
              free(strm);
              JNU_ThrowOutOfMemoryError(env, 0);
*** 81,91 ****
            case Z_STREAM_ERROR:
              free(strm);
              JNU_ThrowIllegalArgumentException(env, 0);
              return jlong_zero;
            default:
!             msg = strm->msg;
              free(strm);
              JNU_ThrowInternalError(env, msg);
              return jlong_zero;
          }
      }
--- 82,96 ----
            case Z_STREAM_ERROR:
              free(strm);
              JNU_ThrowIllegalArgumentException(env, 0);
              return jlong_zero;
            default:
!             msg = ((strm->msg != NULL) ? strm->msg :
!                    (ret == Z_VERSION_ERROR) ?
!                    "zlib returned Z_VERSION_ERROR: "
!                    "compile time and runtime zlib implementations differ" :
!                    "unknown error initializing zlib library");
              free(strm);
              JNU_ThrowInternalError(env, msg);
              return jlong_zero;
          }
      }