You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/07/01 08:51:16 UTC
svn commit: r1750891 - in
/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common:
NodeConfiguration.java utils/DuccProperties.java
Author: degenaro
Date: Fri Jul 1 08:51:16 2016
New Revision: 1750891
URL: http://svn.apache.org/viewvc?rev=1750891&view=rev
Log:
UIMA-4989 Fix problems found by FindBugs
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java?rev=1750891&r1=1750890&r2=1750891&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java Fri Jul 1 08:51:16 2016
@@ -38,6 +38,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.common.utils.IllegalConfigurationException;
import org.apache.uima.ducc.common.utils.SystemPropertyResolver;
+import org.apache.uima.ducc.common.utils.id.DuccId;
/**
* This class reads and parses a node configuration file. It is used primarily by RM for scheduling
@@ -209,24 +210,24 @@ public class NodeConfiguration
*/
private String getDomainName()
{
- // String methodName = "getDomainName";
-
+ String location = "getDomainName";
+ DuccId jobid = null;
if ( defaultDomain != null ) return defaultDomain;
InetAddress me = null;
try {
me = InetAddress.getLocalHost();
+ String my_happy_name = me.getHostName();
+ String my_canonical_name = me.getCanonicalHostName();
+
+ if ( my_canonical_name.startsWith(my_happy_name) ) {
+ int ndx = my_canonical_name.indexOf(".");
+ return my_canonical_name.substring(ndx+1);
+ }
} catch (UnknownHostException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- String my_happy_name = me.getHostName();
- String my_canonical_name = me.getCanonicalHostName();
-
- if ( my_canonical_name.startsWith(my_happy_name) ) {
- int ndx = my_canonical_name.indexOf(".");
- return my_canonical_name.substring(ndx+1);
+ logger.error(location, jobid, e1);
}
+
return null;
}
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java?rev=1750891&r1=1750890&r2=1750891&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java Fri Jul 1 08:51:16 2016
@@ -260,7 +260,7 @@ public class DuccProperties extends Prop
public String getProperty(String k)
{
String val = super.getProperty(k);
- if ( val != null & resolvePlaceholders && val.contains("${") ) {
+ if ( val != null && resolvePlaceholders && val.contains("${") ) {
val = Utils.resolvePlaceholders(val, this);
}
return val;