changeset 764:8c2c2d17f7ce jdk-9+118

Merge
author lana
date Thu, 05 May 2016 19:11:21 +0000
parents 18695748cc41 d5bbdec1fa7c
children daf533920b12
files
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java	Thu May 05 17:35:47 2016 +0000
+++ b/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java	Thu May 05 19:11:21 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java	Thu May 05 17:35:47 2016 +0000
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java	Thu May 05 19:11:21 2016 +0000
@@ -222,7 +222,8 @@
 
     /**
      * locateFileInClassPath returns a DataInputStream that can be used
-     * to read the requested file.  The CLASSPATH is used to locate the file.
+     * to read the requested file.  The resource is located in the java.corba
+     * module or if not found, then the CLASSPATH is searched.
      *
      * @param fileName The name of the file to locate.  The file name
      * may be qualified with a partial path name, using '/' as the separator
@@ -238,6 +239,12 @@
     public static DataInputStream locateFileInClassPath (String fileName)
         throws FileNotFoundException, IOException {
 
+        // The resource should be in the java.corba module
+        InputStream in = FileLocator.class.getResourceAsStream("/" + fileName);
+        if (in != null) {
+            return new DataInputStream(in);
+        }
+
         boolean notFound = true;
         StringTokenizer st;
         String path = "";
--- a/src/java.corba/share/classes/module-info.java	Thu May 05 17:35:47 2016 +0000
+++ b/src/java.corba/share/classes/module-info.java	Thu May 05 19:11:21 2016 +0000
@@ -71,7 +71,4 @@
         java.naming;
     exports com.sun.jndi.url.iiopname to
         java.naming;
-
-    provides javax.naming.spi.InitialContextFactory
-        with com.sun.jndi.cosnaming.CNCtxFactory;
 }