changeset 10816:04bc9b4d254c

8059219: javax.print.PrintServiceLookup allows to register null service Reviewed-by: bae, jgodinez
author prr
date Sun, 05 Oct 2014 10:23:13 -0700
parents ab8bf4e42555
children 01ed46d7846b
files src/java.desktop/share/classes/javax/print/PrintServiceLookup.java test/javax/print/RegisterNullService.java
diffstat 2 files changed, 50 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java	Tue Sep 30 17:39:04 2014 +0400
+++ b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java	Sun Oct 05 10:23:13 2014 -0700
@@ -245,7 +245,7 @@
 
     public static boolean registerService(PrintService service) {
         synchronized (PrintServiceLookup.class) {
-            if (service instanceof StreamPrintService) {
+            if (service == null || service instanceof StreamPrintService) {
                 return false;
             }
             ArrayList<PrintService> registeredServices = getRegisteredServices();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/print/RegisterNullService.java	Sun Oct 05 10:23:13 2014 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 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.
+ *
+ * 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 8059219
+ * @summary Should not be able to register null service.
+ * @run main RegisterNullService
+*/
+
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+
+public class RegisterNullService {
+    public static void main (String [] args) throws RuntimeException {
+
+        boolean registered = PrintServiceLookup.registerService(null);
+        if (registered) {
+           throw new RuntimeException("Null service was registered");
+        }
+        PrintService[] services =
+            PrintServiceLookup.lookupPrintServices(null, null);
+        for (int i = 0; i < services.length; i++) {
+            if (services[i] == null) {
+                throw new RuntimeException("Null service found.");
+            }
+        }
+    }
+}