deleted file mode 100644

@@ -1,433 +0,0 @@

-+++ b/jdk/src/share/back/invoker.c	Mon Mar 21 11:24:09 2016 +0100

-@@ -211,6 +211,47 @@

-     return error;

- }

- 

-+/*

-+ * Delete global references from the request which got put there before a

-+ * invoke request was carried out. See fillInvokeRequest() and invoker invoke*()

-+ * impls.

-+ */

-+static void

-+deleteGlobalRefs(JNIEnv *env, InvokeRequest *request)

-+{

-+    void *cursor;

-+    jint argIndex = 0;

-+    jvalue *argument = request->arguments;

-+    jbyte argumentTag = firstArgumentTypeTag(request->methodSignature, &cursor);

-+

-+    if (request->clazz != NULL) {

-+        tossGlobalRef(env, &(request->clazz));

-+    }

-+    if (request->instance != NULL) {

-+        tossGlobalRef(env, &(request->instance));

-+    }

-+    /* Delete global argument references */

-+    while (argIndex < request->argumentCount) {

-+        if ((argumentTag == JDWP_TAG(OBJECT)) ||

-+            (argumentTag == JDWP_TAG(ARRAY))) {

-+            if (argument->l != NULL) {

-+                tossGlobalRef(env, &(argument->l));

-+            }

-+        }

-+        argument++;

-+        argIndex++;

-+        argumentTag = nextArgumentTypeTag(&cursor);

-+    }

-+    /* Delete potentially saved return values */

-+    if ((request->invokeType == INVOKE_CONSTRUCTOR) ||

-+        (returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT)) ||

-+        (returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY))) {

-+        if (request->returnValue.l != NULL) {

-+            tossGlobalRef(env, &(request->returnValue.l));

-+        }

-+    }

-+}

-+

- static jvmtiError

- fillInvokeRequest(JNIEnv *env, InvokeRequest *request,

-                   jbyte invokeType, jbyte options, jint id,

-@@ -736,6 +777,13 @@

-         (void)outStream_writeObjectRef(env, &out, exc);

-         outStream_sendReply(&out);

-     }

-+

-+    /*

-+     * At this time, there's no need to retain global references on

-+     * arguments since the reply is processed. No one will deal with

-+     * this request ID anymore, so we must call deleteGlobalRefs().

-+     */

-+    deleteGlobalRefs(env, request);

- }

- 

- jboolean

-+++ b/jdk/test/com/sun/jdi/oom/@debuggeeVMOptions	Mon Mar 21 11:24:09 2016 +0100

-@@ -0,0 +1,1 @@

-+-Xmx40m

-\ No newline at end of file

-+++ b/jdk/test/com/sun/jdi/oom/OomDebugTest.java	Mon Mar 21 11:24:09 2016 +0100

-@@ -0,0 +1,312 @@

-+/*

-+ * Copyright (c) 2016 Red Hat Inc.

-+ *

-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

-+ *

-+ * This code is free software; you can redistribute it and/or modify it

-+ * under the terms of the GNU General Public License version 2 only, as

-+ * published by the Free Software Foundation.

-+ *

-+ * This code is distributed in the hope that it will be useful, but WITHOUT

-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

-+ * version 2 for more details (a copy is included in the LICENSE file that

-+ * accompanied this code).

-+ *

-+ * You should have received a copy of the GNU General Public License version

-+ * 2 along with this work; if not, write to the Free Software Foundation,

-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

-+ *

-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

-+ * or visit www.oracle.com if you need additional information or have any

-+ * questions.

-+ */

-+

-+/**

-+ *  @test

-+ *  @bug 4858370

-+ *  @summary JDWP: Memory Leak (global references not deleted after invokeMethod).

-+ *

-+ *  @author Severin Gehwolf <sgehwolf@redhat.com>

-+ *

-+ *  @library ..

-+ *  @run build TestScaffold VMConnection TargetListener TargetAdapter

-+ *  @run compile -g OomDebugTest.java

-+ *  @run shell OomDebugTestSetup.sh

-+ *  @run main OomDebugTest OomDebugTestTarget test1

-+ *  @run main OomDebugTest OomDebugTestTarget test2

-+ *  @run main OomDebugTest OomDebugTestTarget test3

-+ *  @run main OomDebugTest OomDebugTestTarget test4

-+ *  @run main OomDebugTest OomDebugTestTarget test5

-+ */

-+import java.util.ArrayList;

-+import java.util.Collections;

-+import java.util.List;

-+

-+import com.sun.jdi.ArrayReference;

-+import com.sun.jdi.ArrayType;

-+import com.sun.jdi.ClassType;

-+import com.sun.jdi.Field;

-+import com.sun.jdi.InvocationException;

-+import com.sun.jdi.Method;

-+import com.sun.jdi.ObjectReference;

-+import com.sun.jdi.ReferenceType;

-+import com.sun.jdi.StackFrame;

-+import com.sun.jdi.VMOutOfMemoryException;

-+import com.sun.jdi.Value;

-+import com.sun.jdi.event.BreakpointEvent;

-+

-+/***************** Target program **********************/

-+

-+class OomDebugTestTarget {

-+

-+    OomDebugTestTarget() {

-+        System.out.println("DEBUG: invoked constructor");

-+    }

-+    static class FooCls {

-+        @SuppressWarnings("unused")

-+        private byte[] bytes = new byte[3000000];

-+    };

-+

-+    FooCls fooCls = new FooCls();

-+    byte[] byteArray = new byte[0];

-+

-+    void testMethod(FooCls foo) {

-+        System.out.println("DEBUG: invoked 'void testMethod(FooCls)', foo == " + foo);

-+    }

-+

-+    void testPrimitive(byte[] foo) {

-+        System.out.println("DEBUG: invoked 'void testPrimitive(byte[])', foo == " + foo);

-+    }

-+

-+    byte[] testPrimitiveArrRetval() {

-+        System.out.println("DEBUG: invoked 'byte[] testPrimitiveArrRetval()'");

-+        return new byte[3000000];

-+    }

-+

-+    FooCls testFooClsRetval() {

-+        System.out.println("DEBUG: invoked 'FooCls testFooClsRetval()'");

-+        return new FooCls();

-+    }

-+

-+    public void entry() {}

-+

-+    public static void main(String[] args){

-+        System.out.println("DEBUG: OomDebugTestTarget.main");

-+        new OomDebugTestTarget().entry();

-+    }

-+}

-+

-+/***************** Test program ************************/

-+

-+public class OomDebugTest extends TestScaffold {

-+

-+    private static final int TOTAL_TESTS = 1;

-+    private ReferenceType targetClass;

-+    private ObjectReference thisObject;

-+    private int failedTests;

-+    private final String testMethodName;

-+

-+    public OomDebugTest(String[] args) {

-+        super(args);

-+        if (args.length != 2) {

-+            throw new RuntimeException("Test failed unexpectedly.");

-+        }

-+        testMethodName = args[1];

-+    }

-+

-+    @Override

-+    protected void runTests() throws Exception {

-+        try {

-+            /*

-+             * Get to the top of entry()

-+             * to determine targetClass and mainThread

-+             */

-+            BreakpointEvent bpe = startTo("OomDebugTestTarget", "entry", "()V");

-+            targetClass = bpe.location().declaringType();

-+

-+            mainThread = bpe.thread();

-+

-+            StackFrame frame = mainThread.frame(0);

-+            thisObject = frame.thisObject();

-+            java.lang.reflect.Method m = findTestMethod();

-+            m.invoke(this);

-+        } catch (NoSuchMethodException e) {

-+            e.printStackTrace();

-+            failure();

-+        } catch (SecurityException e) {

-+            e.printStackTrace();

-+            failure();

-+        }

-+    }

-+

-+    private java.lang.reflect.Method findTestMethod()

-+            throws NoSuchMethodException, SecurityException {

-+        return OomDebugTest.class.getDeclaredMethod(testMethodName);

-+    }

-+

-+    private void failure() {

-+        failedTests++;

-+    }

-+

-+    /*

-+     * Test case: Object reference as method parameter.

-+     */

-+    @SuppressWarnings("unused") // called via reflection

-+    private void test1() throws Exception {

-+        System.out.println("DEBUG: ------------> Running " + testMethodName);

-+        try {

-+            Field field = targetClass.fieldByName("fooCls");

-+            ClassType clsType = (ClassType)field.type();

-+            Method constructor = getConstructorForClass(clsType);

-+            for (int i = 0; i < 15; i++) {

-+                @SuppressWarnings({ "rawtypes", "unchecked" })

-+                ObjectReference objRef = clsType.newInstance(mainThread,

-+                                                             constructor,

-+                                                             new ArrayList(0),

-+                                                             ObjectReference.INVOKE_NONVIRTUAL);

-+                invoke("testMethod", "(LOomDebugTestTarget$FooCls;)V", objRef);

-+            }

-+        } catch (InvocationException e) {

-+            handleFailure(e);

-+        }

-+    }

-+

-+    /*

-+     * Test case: Array reference as method parameter.

-+     */

-+    @SuppressWarnings("unused") // called via reflection

-+    private void test2() throws Exception {

-+        System.out.println("DEBUG: ------------> Running " + testMethodName);

-+        try {

-+            Field field = targetClass.fieldByName("byteArray");

-+            ArrayType arrType = (ArrayType)field.type();

-+

-+            for (int i = 0; i < 15; i++) {

-+                ArrayReference byteArrayVal = arrType.newInstance(3000000);

-+                invoke("testPrimitive", "([B)V", byteArrayVal);

-+            }

-+        } catch (VMOutOfMemoryException e) {

-+            defaultHandleOOMFailure(e);

-+        }

-+    }

-+

-+    /*

-+     * Test case: Array reference as return value.

-+     */

-+    @SuppressWarnings("unused") // called via reflection

-+    private void test3() throws Exception {

-+        System.out.println("DEBUG: ------------> Running " + testMethodName);

-+        try {

-+            for (int i = 0; i < 15; i++) {

-+                invoke("testPrimitiveArrRetval",

-+                       "()[B",

-+                       Collections.EMPTY_LIST,

-+                       vm().mirrorOfVoid());

-+            }

-+        } catch (InvocationException e) {

-+            handleFailure(e);

-+        }

-+    }

-+

-+    /*

-+     * Test case: Object reference as return value.

-+     */

-+    @SuppressWarnings("unused") // called via reflection

-+    private void test4() throws Exception {

-+        System.out.println("DEBUG: ------------> Running " + testMethodName);

-+        try {

-+            for (int i = 0; i < 15; i++) {

-+                invoke("testFooClsRetval",

-+                       "()LOomDebugTestTarget$FooCls;",

-+                       Collections.EMPTY_LIST,

-+                       vm().mirrorOfVoid());

-+            }

-+        } catch (InvocationException e) {

-+            handleFailure(e);

-+        }

-+    }

-+

-+    /*

-+     * Test case: Constructor

-+     */

-+    @SuppressWarnings({ "unused", "unchecked", "rawtypes" }) // called via reflection

-+    private void test5() throws Exception {

-+        System.out.println("DEBUG: ------------> Running " + testMethodName);

-+        try {

-+            ClassType type = (ClassType)thisObject.type();

-+            for (int i = 0; i < 15; i++) {

-+                type.newInstance(mainThread,

-+                                 findMethod(targetClass, "<init>", "()V"),

-+                                 new ArrayList(0),

-+                                 ObjectReference.INVOKE_NONVIRTUAL);

-+            }

-+        } catch (InvocationException e) {

-+            handleFailure(e);

-+        }

-+    }

-+

-+    private Method getConstructorForClass(ClassType clsType) {

-+        List<Method> methods = clsType.methodsByName("<init>");

-+        if (methods.size() != 1) {

-+            throw new RuntimeException("FAIL. Expected only one, the default, constructor");

-+        }

-+        return methods.get(0);

-+    }

-+

-+    private void handleFailure(InvocationException e) {

-+        // There is no good way to see the OOME diagnostic message in the target since the

-+        // TestScaffold might throw an exception while trying to print the stack trace. I.e

-+        // it might get a a VMDisconnectedException before the stack trace printing finishes.

-+        System.err.println("FAILURE: InvocationException caused by OOM");

-+        defaultHandleOOMFailure(e);

-+    }

-+

-+    private void defaultHandleOOMFailure(Exception e) {

-+        e.printStackTrace();

-+        failure();

-+    }

-+

-+    @SuppressWarnings({ "rawtypes", "unchecked" })

-+    void invoke(String methodName, String methodSig, Value value)

-+            throws Exception {

-+        List args = new ArrayList(1);

-+        args.add(value);

-+        invoke(methodName, methodSig, args, value);

-+    }

-+

-+    void invoke(String methodName,

-+                String methodSig,

-+                @SuppressWarnings("rawtypes") List args,

-+                Value value) throws Exception {

-+        Method method = findMethod(targetClass, methodName, methodSig);

-+        if ( method == null) {

-+            failure("FAILED: Can't find method: "

-+                    + methodName  + " for class = " + targetClass);

-+            return;

-+        }

-+        invoke(method, args, value);

-+    }

-+

-+    @SuppressWarnings({ "rawtypes", "unchecked" })

-+    void invoke(Method method, List args, Value value) throws Exception {

-+        thisObject.invokeMethod(mainThread, method, args, 0);

-+        System.out.println("DEBUG: Done invoking method via debugger.");

-+    }

-+

-+    Value fieldValue(String fieldName) {

-+        Field field = targetClass.fieldByName(fieldName);

-+        return thisObject.getValue(field);

-+    }

-+

-+    public static void main(String[] args) throws Exception {

-+        OomDebugTest oomTest = new OomDebugTest(args);

-+        oomTest.startTests();

-+        if (oomTest.failedTests > 0) {

-+            throw new RuntimeException(oomTest.failedTests

-+                                       + " of " + TOTAL_TESTS + " test(s) failed.");

-+        }

-+        System.out.println("All " + TOTAL_TESTS + " tests passed.");

-+    }

-+

-+}

-+++ b/jdk/test/com/sun/jdi/oom/OomDebugTestSetup.sh	Mon Mar 21 11:24:09 2016 +0100

-@@ -0,0 +1,46 @@

-+#!/bin/sh

-+#

-+# Copyright (c) 2016 Red Hat Inc.

-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

-+#

-+# This code is free software; you can redistribute it and/or modify it

-+# under the terms of the GNU General Public License version 2 only, as

-+# published by the Free Software Foundation.

-+#

-+# This code is distributed in the hope that it will be useful, but WITHOUT

-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

-+# version 2 for more details (a copy is included in the LICENSE file that

-+# accompanied this code).

-+#

-+# You should have received a copy of the GNU General Public License version

-+# 2 along with this work; if not, write to the Free Software Foundation,

-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

-+#

-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

-+# or visit www.oracle.com if you need additional information or have any

-+# questions.

-+#

-+

-+

-+if [ "${TESTSRC}" = "" ]

-+then

-+  echo "TESTSRC not set.  Test cannot execute.  Failed."

-+  exit 1

-+fi

-+echo "TESTSRC=${TESTSRC}"

-+

-+if [ "${TESTJAVA}" = "" ]

-+then

-+  echo "TESTJAVA not set.  Test cannot execute.  Failed."

-+  exit 1

-+fi

-+echo "TESTJAVA=${TESTJAVA}"

-+

-+if [ "${TESTCLASSES}" = "" ]

-+then

-+  echo "TESTCLASSES not set.  Test cannot execute.  Failed."

-+  exit 1

-+fi

-+

-+cp ${TESTSRC}/@debuggeeVMOptions ${TESTCLASSES}/

@@ -2,18 +2,18 @@

 %global security_hardening none

 Summary:	OpenJDK

 Name:		openjdk8

-Version:	1.8.0.131

-Release:	4%{?dist}

+Version:	1.8.0.141

+Release:	1%{?dist}

 License:	GNU GPL

 URL:		https://openjdk.java.net

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution:   Photon

-Source0:	http://www.java.net/download/openjdk/jdk8/promoted/b131/openjdk-%{version}.tar.bz2

-%define sha1 openjdk=ae01c24fe5247d5aa246a60c0272ba92188a7d55

+Source0:	http://www.java.net/download/openjdk/jdk8/promoted/b131/openjdk-%{version}.tar.gz

+%define sha1 openjdk=e74417bc0bfcdb8f6b30a63bb26dbf35515ec562

 Patch0:		Awt_build_headless_only.patch

-Patch1:		Fix-memory-leak.patch

-Patch2:		check-system-ca-certs.patch

+Patch1:		check-system-ca-certs.patch

+Patch2:         remove-cups.patch

 BuildRequires:  pcre-devel

 BuildRequires:	which

 BuildRequires:	zip

@@ -64,7 +64,7 @@ Requires:       %{name} = %{version}-%{release}

 This package provides the runtime library class sources.

 %prep -p exit

-%setup -q -n openjdk

+%setup -qn openjdk-1.8.0-141

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

@@ -233,6 +233,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/jvm/OpenJDK-%{version}/src.zip

 %changelog

+*   Fri Jul 21 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.141-1

+-   Upgraded to version 1.8.0.141-1

 *   Thu Jul 6 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-4

 -   Build AWT libraries as well.

 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 1.8.0.131-3

new file mode 100644

@@ -0,0 +1,449 @@

+diff -Naur openjdk-1.8.0-141/jdk/src/solaris/native/sun/awt/CUPSfuncs.c openjdk-1.8.0.141/jdk/src/solaris/native/sun/awt/CUPSfuncs.c

+--- a/jdk/src/solaris/native/sun/awt/CUPSfuncs.c	2017-07-21 15:17:04.000000000 -0700

+@@ -1,445 +0,0 @@

+-/*

+- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.

+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+- *

+- * This code is free software; you can redistribute it and/or modify it

+- * under the terms of the GNU General Public License version 2 only, as

+- * published by the Free Software Foundation.  Oracle designates this

+- * particular file as subject to the "Classpath" exception as provided

+- * by Oracle in the LICENSE file that accompanied this code.

+- *

+- * This code is distributed in the hope that it will be useful, but WITHOUT

+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

+- * version 2 for more details (a copy is included in the LICENSE file that

+- * accompanied this code).

+- *

+- * You should have received a copy of the GNU General Public License version

+- * 2 along with this work; if not, write to the Free Software Foundation,

+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

+- *

+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA

+- * or visit www.oracle.com if you need additional information or have any

+- * questions.

+- */

+-

+-#include <jni.h>

+-#include <jni_util.h>

+-#include <jvm_md.h>

+-#include <dlfcn.h>

+-#include <cups/cups.h>

+-#include <cups/ppd.h>

+-

+-//#define CUPS_DEBUG

+-

+-#ifdef CUPS_DEBUG

+-#define DPRINTF(x, y) fprintf(stderr, x, y);

+-#else

+-#define DPRINTF(x, y)

+-#endif

+-

+-typedef const char* (*fn_cupsServer)(void);

+-typedef int (*fn_ippPort)(void);

+-typedef http_t* (*fn_httpConnect)(const char *, int);

+-typedef void (*fn_httpClose)(http_t *);

+-typedef char* (*fn_cupsGetPPD)(const char *);

+-typedef cups_dest_t* (*fn_cupsGetDest)(const char *name,

+-    const char *instance, int num_dests, cups_dest_t *dests);

+-typedef int (*fn_cupsGetDests)(cups_dest_t **dests);

+-typedef void (*fn_cupsFreeDests)(int num_dests, cups_dest_t *dests);

+-typedef ppd_file_t* (*fn_ppdOpenFile)(const char *);

+-typedef void (*fn_ppdClose)(ppd_file_t *);

+-typedef ppd_option_t* (*fn_ppdFindOption)(ppd_file_t *, const char *);

+-typedef ppd_size_t* (*fn_ppdPageSize)(ppd_file_t *, char *);

+-

+-fn_cupsServer j2d_cupsServer;

+-fn_ippPort j2d_ippPort;

+-fn_httpConnect j2d_httpConnect;

+-fn_httpClose j2d_httpClose;

+-fn_cupsGetPPD j2d_cupsGetPPD;

+-fn_cupsGetDest j2d_cupsGetDest;

+-fn_cupsGetDests j2d_cupsGetDests;

+-fn_cupsFreeDests j2d_cupsFreeDests;

+-fn_ppdOpenFile j2d_ppdOpenFile;

+-fn_ppdClose j2d_ppdClose;

+-fn_ppdFindOption j2d_ppdFindOption;

+-fn_ppdPageSize j2d_ppdPageSize;

+-

+-

+-/*

+- * Initialize library functions.

+- * // REMIND : move tab , add dlClose before return

+- */

+-JNIEXPORT jboolean JNICALL

+-Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env,

+-                                         jobject printObj) {

+-  void *handle = dlopen(VERSIONED_JNI_LIB_NAME("cups", "2"),

+-                        RTLD_LAZY | RTLD_GLOBAL);

+-

+-  if (handle == NULL) {

+-    handle = dlopen(JNI_LIB_NAME("cups"), RTLD_LAZY | RTLD_GLOBAL);

+-    if (handle == NULL) {

+-      return JNI_FALSE;

+-    }

+-  }

+-

+-  j2d_cupsServer = (fn_cupsServer)dlsym(handle, "cupsServer");

+-  if (j2d_cupsServer == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_ippPort = (fn_ippPort)dlsym(handle, "ippPort");

+-  if (j2d_ippPort == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_httpConnect = (fn_httpConnect)dlsym(handle, "httpConnect");

+-  if (j2d_httpConnect == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_httpClose = (fn_httpClose)dlsym(handle, "httpClose");

+-  if (j2d_httpClose == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_cupsGetPPD = (fn_cupsGetPPD)dlsym(handle, "cupsGetPPD");

+-  if (j2d_cupsGetPPD == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_cupsGetDest = (fn_cupsGetDest)dlsym(handle, "cupsGetDest");

+-  if (j2d_cupsGetDest == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_cupsGetDests = (fn_cupsGetDests)dlsym(handle, "cupsGetDests");

+-  if (j2d_cupsGetDests == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_cupsFreeDests = (fn_cupsFreeDests)dlsym(handle, "cupsFreeDests");

+-  if (j2d_cupsFreeDests == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_ppdOpenFile = (fn_ppdOpenFile)dlsym(handle, "ppdOpenFile");

+-  if (j2d_ppdOpenFile == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-

+-  }

+-

+-  j2d_ppdClose = (fn_ppdClose)dlsym(handle, "ppdClose");

+-  if (j2d_ppdClose == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-

+-  }

+-

+-  j2d_ppdFindOption = (fn_ppdFindOption)dlsym(handle, "ppdFindOption");

+-  if (j2d_ppdFindOption == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  j2d_ppdPageSize = (fn_ppdPageSize)dlsym(handle, "ppdPageSize");

+-  if (j2d_ppdPageSize == NULL) {

+-    dlclose(handle);

+-    return JNI_FALSE;

+-  }

+-

+-  return JNI_TRUE;

+-}

+-

+-/*

+- * Gets CUPS server name.

+- *

+- */

+-JNIEXPORT jstring JNICALL

+-Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env,

+-                                         jobject printObj)

+-{

+-    jstring cServer = NULL;

+-    const char* server = j2d_cupsServer();

+-    if (server != NULL) {

+-        // Is this a local domain socket?

+-        if (strncmp(server, "/", 1) == 0) {

+-            cServer = JNU_NewStringPlatform(env, "localhost");

+-        } else {

+-            cServer = JNU_NewStringPlatform(env, server);

+-        }

+-    }

+-    return cServer;

+-}

+-

+-/*

+- * Gets CUPS port name.

+- *

+- */

+-JNIEXPORT jint JNICALL

+-Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env,

+-                                         jobject printObj)

+-{

+-    int port = j2d_ippPort();

+-    return (jint) port;

+-}

+-

+-

+-/*

+- * Gets CUPS default printer name.

+- *

+- */

+-JNIEXPORT jstring JNICALL

+-Java_sun_print_CUPSPrinter_getCupsDefaultPrinter(JNIEnv *env,

+-                                                  jobject printObj)

+-{

+-    jstring cDefPrinter = NULL;

+-    cups_dest_t *dests;

+-    char *defaultPrinter = NULL;

+-    int num_dests = j2d_cupsGetDests(&dests);

+-    int i = 0;

+-    cups_dest_t *dest = j2d_cupsGetDest(NULL, NULL, num_dests, dests);

+-    if (dest != NULL) {

+-        defaultPrinter = dest->name;

+-        if (defaultPrinter != NULL) {

+-            cDefPrinter = JNU_NewStringPlatform(env, defaultPrinter);

+-        }

+-    }

+-    j2d_cupsFreeDests(num_dests, dests);

+-    return cDefPrinter;

+-}

+-

+-/*

+- * Checks if connection can be made to the server.

+- *

+- */

+-JNIEXPORT jboolean JNICALL

+-Java_sun_print_CUPSPrinter_canConnect(JNIEnv *env,

+-                                      jobject printObj,

+-                                      jstring server,

+-                                      jint port)

+-{

+-    const char *serverName;

+-    serverName = (*env)->GetStringUTFChars(env, server, NULL);

+-    if (serverName != NULL) {

+-        http_t *http = j2d_httpConnect(serverName, (int)port);

+-        (*env)->ReleaseStringUTFChars(env, server, serverName);

+-        if (http != NULL) {

+-            j2d_httpClose(http);

+-            return JNI_TRUE;

+-        }

+-    }

+-    return JNI_FALSE;

+-}

+-

+-

+-/*

+- * Returns list of media: pages + trays

+- */

+-JNIEXPORT jobjectArray JNICALL

+-Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env,

+-                                         jobject printObj,

+-                                         jstring printer)

+-{

+-    ppd_file_t *ppd;

+-    ppd_option_t *optionTray, *optionPage;

+-    ppd_choice_t *choice;

+-    const char *name;

+-    const char *filename;

+-    int i, nTrays=0, nPages=0, nTotal=0;

+-    jstring utf_str;

+-    jclass cls;

+-    jobjectArray nameArray = NULL;

+-

+-    name = (*env)->GetStringUTFChars(env, printer, NULL);

+-    if (name == NULL) {

+-        (*env)->ExceptionClear(env);

+-        JNU_ThrowOutOfMemoryError(env, "Could not create printer name");

+-        return NULL;

+-    }

+-

+-    // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file.

+-    // unlink() must be caled to remove the file when finished using it.

+-    filename = j2d_cupsGetPPD(name);

+-    (*env)->ReleaseStringUTFChars(env, printer, name);

+-    CHECK_NULL_RETURN(filename, NULL);

+-

+-    cls = (*env)->FindClass(env, "java/lang/String");

+-    CHECK_NULL_RETURN(cls, NULL);

+-

+-    if ((ppd = j2d_ppdOpenFile(filename)) == NULL) {

+-        unlink(filename);

+-        DPRINTF("CUPSfuncs::unable to open PPD  %s\n", filename);

+-        return NULL;

+-    }

+-

+-    optionPage = j2d_ppdFindOption(ppd, "PageSize");

+-    if (optionPage != NULL) {

+-        nPages = optionPage->num_choices;

+-    }

+-

+-    optionTray = j2d_ppdFindOption(ppd, "InputSlot");

+-    if (optionTray != NULL) {

+-        nTrays = optionTray->num_choices;

+-    }

+-

+-    if ((nTotal = (nPages+nTrays) *2) > 0) {

+-        nameArray = (*env)->NewObjectArray(env, nTotal, cls, NULL);

+-        if (nameArray == NULL) {

+-            unlink(filename);

+-            j2d_ppdClose(ppd);

+-            DPRINTF("CUPSfuncs::bad alloc new array\n", "")

+-            (*env)->ExceptionClear(env);

+-            JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

+-            return NULL;

+-        }

+-

+-        for (i = 0; optionPage!=NULL && i<nPages; i++) {

+-            choice = (optionPage->choices)+i;

+-            utf_str = JNU_NewStringPlatform(env, choice->text);

+-            if (utf_str == NULL) {

+-                unlink(filename);

+-                j2d_ppdClose(ppd);

+-                DPRINTF("CUPSfuncs::bad alloc new string ->text\n", "")

+-                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

+-                return NULL;

+-            }

+-            (*env)->SetObjectArrayElement(env, nameArray, i*2, utf_str);

+-            (*env)->DeleteLocalRef(env, utf_str);

+-            utf_str = JNU_NewStringPlatform(env, choice->choice);

+-            if (utf_str == NULL) {

+-                unlink(filename);

+-                j2d_ppdClose(ppd);

+-                DPRINTF("CUPSfuncs::bad alloc new string ->choice\n", "")

+-                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

+-                return NULL;

+-            }

+-            (*env)->SetObjectArrayElement(env, nameArray, i*2+1, utf_str);

+-            (*env)->DeleteLocalRef(env, utf_str);

+-        }

+-

+-        for (i = 0; optionTray!=NULL && i<nTrays; i++) {

+-            choice = (optionTray->choices)+i;

+-            utf_str = JNU_NewStringPlatform(env, choice->text);

+-            if (utf_str == NULL) {

+-                unlink(filename);

+-                j2d_ppdClose(ppd);

+-                DPRINTF("CUPSfuncs::bad alloc new string text\n", "")

+-                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

+-                return NULL;

+-            }

+-            (*env)->SetObjectArrayElement(env, nameArray,

+-                                          (nPages+i)*2, utf_str);

+-            (*env)->DeleteLocalRef(env, utf_str);

+-            utf_str = JNU_NewStringPlatform(env, choice->choice);

+-            if (utf_str == NULL) {

+-                unlink(filename);

+-                j2d_ppdClose(ppd);

+-                DPRINTF("CUPSfuncs::bad alloc new string choice\n", "")

+-                JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");

+-                return NULL;

+-            }

+-            (*env)->SetObjectArrayElement(env, nameArray,

+-                                          (nPages+i)*2+1, utf_str);

+-            (*env)->DeleteLocalRef(env, utf_str);

+-        }

+-    }

+-    j2d_ppdClose(ppd);

+-    unlink(filename);

+-    return nameArray;

+-}

+-

+-

+-/*

+- * Returns list of page sizes and imageable area.

+- */

+-JNIEXPORT jfloatArray JNICALL

+-Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,

+-                                         jobject printObj,

+-                                         jstring printer)

+-{

+-    ppd_file_t *ppd;

+-    ppd_option_t *option;

+-    ppd_choice_t *choice;

+-    ppd_size_t *size;

+-

+-    const char *name = (*env)->GetStringUTFChars(env, printer, NULL);

+-    if (name == NULL) {

+-        (*env)->ExceptionClear(env);

+-        JNU_ThrowOutOfMemoryError(env, "Could not create printer name");

+-        return NULL;

+-    }

+-    const char *filename;

+-    int i;

+-    jobjectArray sizeArray = NULL;

+-    jfloat *dims;

+-

+-    // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file.

+-    // unlink() must be called to remove the file after using it.

+-    filename = j2d_cupsGetPPD(name);

+-    (*env)->ReleaseStringUTFChars(env, printer, name);

+-    CHECK_NULL_RETURN(filename, NULL);

+-    if ((ppd = j2d_ppdOpenFile(filename)) == NULL) {

+-        unlink(filename);

+-        DPRINTF("unable to open PPD  %s\n", filename)

+-        return NULL;

+-    }

+-    option = j2d_ppdFindOption(ppd, "PageSize");

+-    if (option != NULL && option->num_choices > 0) {

+-        // create array of dimensions - (num_choices * 6)

+-        //to cover length & height

+-        DPRINTF( "CUPSfuncs::option->num_choices %d\n", option->num_choices)

+-        // +1 is for storing the default media index

+-        sizeArray = (*env)->NewFloatArray(env, option->num_choices*6+1);