changeset 779:3d3ef4073bdd

6731826: race condition in UnixPrintServiceLookup Reviewed-by: campbell, tdv
author jgodinez
date Tue, 19 Aug 2008 16:04:06 -0700
parents 3c4561f955f3
children cd88b4ad7f25
files src/solaris/classes/sun/print/IPPPrintService.java test/javax/print/TestRaceCond.java
diffstat 2 files changed, 58 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/classes/sun/print/IPPPrintService.java	Thu Aug 07 22:24:26 2008 -0700
+++ b/src/solaris/classes/sun/print/IPPPrintService.java	Tue Aug 19 16:04:06 2008 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2007 Sun Microsystems, Inc.  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
@@ -1864,4 +1864,8 @@
                  (obj instanceof IPPPrintService &&
                   ((IPPPrintService)obj).getName().equals(getName())));
     }
+
+    public int hashCode() {
+        return this.getClass().hashCode()+getName().hashCode();
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/print/TestRaceCond.java	Tue Aug 19 16:04:06 2008 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6731826
+ * @summary  There should be no RuntimeException.
+ * @run main TestRaceCond
+ */
+
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+
+
+public class TestRaceCond {
+
+    public static void main(String argv[]) {
+        trial();
+    }
+
+    static void trial() {
+        PrintService pserv1 = PrintServiceLookup.lookupDefaultPrintService();
+        PrintService[] pservs = PrintServiceLookup.lookupPrintServices(null, null);
+        PrintService pserv2 = PrintServiceLookup.lookupDefaultPrintService();
+
+        if (pserv1.hashCode() != pserv2.hashCode()) {
+            throw new RuntimeException("Different hashCodes for equal print "
+                            + "services: " + pserv1.hashCode() + " "
+                            + pserv2.hashCode());
+        }
+    }
+}
+