infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 19:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

8059219: javax.print.PrintServiceLookup allows to register null service

Browse Source 
Reviewed-by: bae, jgodinez
This commit is contained in:
Phil Race 2014-10-05 10:23:13 -07:00
parent 7a259eeb29
commit ac20afc6be
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
View File

@ -245,7 +245,7 @@ public abstract class PrintServiceLookup {
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();

49
jdk/test/javax/print/RegisterNullService.java Normal file
View File

@ -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.");
}
}
}
}