You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/07/15 10:12:19 UTC
directory-kerby git commit: DIRKRB-353 Fix findbugs Problem for lib
module. Contributed by Yaning.
Repository: directory-kerby
Updated Branches:
refs/heads/master 57e0f302b -> 2b72ce31e
DIRKRB-353 Fix findbugs Problem for lib module. Contributed by Yaning.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/2b72ce31
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/2b72ce31
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/2b72ce31
Branch: refs/heads/master
Commit: 2b72ce31ea106b5e503c70dd6d726378d351186f
Parents: 57e0f30
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 15 16:17:57 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 15 16:17:57 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kerby/config/IniConfigLoader.java | 4 +++-
.../src/main/java/org/apache/kerby/config/MapConfigLoader.java | 5 ++---
.../java/org/apache/kerby/config/PropertiesConfigLoader.java | 6 +++---
.../src/main/java/org/apache/kerby/config/Resource.java | 4 +++-
.../src/main/java/org/apache/kerby/config/XmlConfigLoader.java | 5 +----
lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java | 4 ++--
lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java | 4 ++++
7 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-config/src/main/java/org/apache/kerby/config/IniConfigLoader.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/IniConfigLoader.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/IniConfigLoader.java
index f1f5851..69e58ab 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/IniConfigLoader.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/IniConfigLoader.java
@@ -23,6 +23,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
public class IniConfigLoader extends ConfigLoader {
private static final String COMMENT_SYMBOL = "#";
@@ -39,12 +40,13 @@ public class IniConfigLoader extends ConfigLoader {
currentConfig = config;
InputStream is = (InputStream) resource.getResource();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
String line;
while ((line = reader.readLine()) != null) {
parseLine(line);
}
+ reader.close();
}
private void parseLine(String line) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-config/src/main/java/org/apache/kerby/config/MapConfigLoader.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/MapConfigLoader.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/MapConfigLoader.java
index 734d6a4..9a212c3 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/MapConfigLoader.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/MapConfigLoader.java
@@ -26,9 +26,8 @@ public class MapConfigLoader extends ConfigLoader {
protected void loadConfig(ConfigImpl config, Resource resource) {
@SuppressWarnings("unchecked")
Map<String, String> mapConfig = (Map<String, String>) resource.getResource();
- for (String key : mapConfig.keySet()) {
- String value = mapConfig.get(key);
- config.set(key, value);
+ for (Map.Entry<String, String> entry : mapConfig.entrySet()) {
+ config.set(entry.getKey(), entry.getValue());
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-config/src/main/java/org/apache/kerby/config/PropertiesConfigLoader.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/PropertiesConfigLoader.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/PropertiesConfigLoader.java
index 6fe4bf1..58a04b9 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/PropertiesConfigLoader.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/PropertiesConfigLoader.java
@@ -32,9 +32,9 @@ public class PropertiesConfigLoader extends ConfigLoader {
protected void loadConfig(ConfigImpl config, Properties propConfig) {
for (Object key : propConfig.keySet()) {
if (key instanceof String) {
- Object value = propConfig.getProperty((String) key);
- if (value != null && value instanceof String) {
- config.set((String) key, (String) value);
+ String value = propConfig.getProperty((String) key);
+ if (value != null) {
+ config.set((String) key, value);
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-config/src/main/java/org/apache/kerby/config/Resource.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/Resource.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/Resource.java
index 7973e7e..9988ffa 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/Resource.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/Resource.java
@@ -88,7 +88,9 @@ public final class Resource {
}
private Resource(String name, File resourceFile, Format format) throws FileNotFoundException {
- this(name, new FileInputStream(resourceFile), format);
+ this.name = name;
+ this.resource = new FileInputStream(resourceFile);
+ this.format = format;
}
private Resource(URL resourceUrl, Format format) throws IOException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
index 425cb44..2fd2f9c 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/XmlConfigLoader.java
@@ -41,7 +41,7 @@ public class XmlConfigLoader extends ConfigLoader {
@Override
protected void loadConfig(ConfigImpl config, Resource resource) throws Exception {
Element doc = loadResourceDocument(resource);
- loadConfig((ConfigImpl) config, doc);
+ loadConfig(config, doc);
}
private Element loadResourceDocument(Resource resource) throws Exception {
@@ -104,10 +104,7 @@ public class XmlConfigLoader extends ConfigLoader {
loadConfig(cfg, prop);
value = new ConfigObject(cfg);
}
-
- if (name != null) {
config.set(name, value);
- }
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
----------------------------------------------------------------------
diff --git a/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java b/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
index f55deaa..0094610 100644
--- a/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
+++ b/lib/kerby-util/src/main/java/org/apache/kerby/KOptions.java
@@ -155,9 +155,9 @@ public class KOptions {
Object value = getOptionValue(option);
if (value instanceof String) {
String strVal = (String) value;
- return Integer.valueOf(strVal);
+ return Integer.parseInt(strVal);
} else if (value instanceof Integer) {
- return (Integer) value;
+ return ((Integer) value).intValue();
}
return -1;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b72ce31/lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
----------------------------------------------------------------------
diff --git a/lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java b/lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
index b384856..143c8cc 100644
--- a/lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
+++ b/lib/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
@@ -475,6 +475,8 @@ public class Base64 {
buffer[pos++] = PAD;
}
break;
+ default:
+ break;
}
if (lineLength > 0 && pos > 0) {
System.arraycopy(lineSeparator, 0, buffer, pos, lineSeparator.length);
@@ -576,6 +578,8 @@ public class Base64 {
buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
buffer[pos++] = (byte) ((x >> 8) & MASK_8BITS);
break;
+ default :
+ break;
}
}
}