1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java Thu Apr 04 19:05:24 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java Tue Apr 09 14:51:13 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -36,7 +36,6 @@ 1.11 1.12 import com.sun.istack.internal.tools.MaskingClassLoader; 1.13 import com.sun.istack.internal.tools.ParallelWorldClassLoader; 1.14 -import com.sun.tools.internal.xjc.SecureLoader; 1.15 1.16 /** 1.17 * Creates a class loader configured to run XJC 1.0/2.0 safely without 1.18 @@ -62,7 +61,7 @@ 1.19 // JAXB API is loaded from the bootstrap. We need to override one with ours 1.20 mustang = true; 1.21 1.22 - List mask = new ArrayList(Arrays.asList(maskedPackages)); 1.23 + List<String> mask = new ArrayList<String>(Arrays.asList(maskedPackages)); 1.24 mask.add("javax.xml.bind."); 1.25 1.26 cl = new MaskingClassLoader(cl,mask); 1.27 @@ -80,7 +79,7 @@ 1.28 // so that the XJC2 classes in the parent class loader 1.29 // won't interfere with loading XJC1 classes in a child class loader 1.30 1.31 - if (v.equals("1.0")) { 1.32 + if ("1.0".equals(v)) { 1.33 if(!mustang) 1.34 // if we haven't used Masking ClassLoader, do so now. 1.35 cl = new MaskingClassLoader(cl,toolPackages);