You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/05/14 08:56:55 UTC
svn commit: r1594487 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Author: andygumbrecht
Date: Wed May 14 06:56:55 2014
New Revision: 1594487
URL: http://svn.apache.org/r1594487
Log:
Finals
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1594487&r1=1594486&r2=1594487&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Wed May 14 06:56:55 2014
@@ -1186,14 +1186,14 @@ public class ConfigurationFactory implem
* Takes a raw unparsed string expected to be in jvm classpath syntax
* and parses it, producing a collection of URIs representing the absolute
* file paths of the classpath to be created.
- *
+ * <p/>
* OS specific delimiters are supported.
*
* @param rawstring unparsed string in "classpath" syntax
- * @return
+ * @return URI array
* @throws IOException if path cannot be resolved or file referenced does not exist
*/
- public static URI[] resolveClasspath(String rawstring) throws IOException {
+ public static URI[] resolveClasspath(final String rawstring) throws IOException {
final FileUtils base = SystemInstance.get().getBase();
final String[] strings = rawstring.split(File.pathSeparator);
@@ -1277,7 +1277,7 @@ public class ConfigurationFactory implem
// because we just have the service properties, not our defaults
final Properties properties = service.getProperties();
if ((properties.containsKey("JdbcDriver") || properties.containsKey("JdbcUrl") || properties.containsKey("url"))
- && (properties.containsKey("JtaManaged") || properties.containsKey("UserName") || properties.containsKey("Password"))) {
+ && (properties.containsKey("JtaManaged") || properties.containsKey("UserName") || properties.containsKey("Password"))) {
service.setType("javax.sql.DataSource");
}
}
@@ -1586,7 +1586,7 @@ public class ConfigurationFactory implem
// both null or the same id
if (refA == null && refB == null ||
- refA != null && refA.equals(refB)) {
+ refA != null && refA.equals(refB)) {
return EQUAL;
}