stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-05-05 19:11:21 +00:00
commit c97ab6df62
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java
View File

@ -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

9
corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java
View File

@ -222,7 +222,8 @@ public abstract class FileLocator extends Object {
/**
* 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 abstract class FileLocator extends Object {
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 = "";

3
corba/src/java.corba/share/classes/module-info.java
View File

@ -71,7 +71,4 @@ module java.corba {
java.naming;
exports com.sun.jndi.url.iiopname to
java.naming;
provides javax.naming.spi.InitialContextFactory
with com.sun.jndi.cosnaming.CNCtxFactory;
}