From d26010844ab53cd343aab9314b5998a99ecc3fb9 Mon Sep 17 00:00:00 2001
From: fangshunjian <fangshunjian@nismail.iie.ac.cn>
Date: Fri, 23 Nov 2018 11:16:51 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BB=E5=8F=96=20myconfig.propert?=
 =?UTF-8?q?ies=20=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E5=8C=85=E8=A3=85?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=BD=93key=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=E9=80=9A=E8=BF=87getString()?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=80=BC=E6=97=B6=E6=8A=9B=E5=87=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/nms/thread/MailingManagerThread.java |  3 +-
 src/nis/nms/util/BaseAction.java             |  6 +--
 src/nis/nms/util/ResourceBundleWrapper.java  | 50 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 src/nis/nms/util/ResourceBundleWrapper.java

diff --git a/src/com/nms/thread/MailingManagerThread.java b/src/com/nms/thread/MailingManagerThread.java
index 3090d81..6a3d493 100644
--- a/src/com/nms/thread/MailingManagerThread.java
+++ b/src/com/nms/thread/MailingManagerThread.java
@@ -6,6 +6,7 @@ import java.util.concurrent.Future;
 
 import nis.nms.util.BaseAction;
 import nis.nms.util.ConnectionOracle;
+import nis.nms.util.ResourceBundleWrapper;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -44,7 +45,7 @@ public class MailingManagerThread implements Runnable{
 				}
 			}		
 			
-			ResourceBundle rb = BaseAction.rb;			
+			ResourceBundleWrapper rb = BaseAction.rb;			
 			String address = rb.getString("email.address");
 			String userName = rb.getString("email.userName");
 			String password = rb.getString("email.password");
diff --git a/src/nis/nms/util/BaseAction.java b/src/nis/nms/util/BaseAction.java
index 31ddbe5..70e6f1b 100644
--- a/src/nis/nms/util/BaseAction.java
+++ b/src/nis/nms/util/BaseAction.java
@@ -249,7 +249,7 @@ public abstract  class  BaseAction extends ActionSupport implements Serializable
 //	private CommonService commonService;
 	private static final long serialVersionUID = 7414962517552053966L;
 
-	public static ResourceBundle rb = ResourceBundle.getBundle("myconfig");
+	public static ResourceBundleWrapper rb = new ResourceBundleWrapper(ResourceBundle.getBundle("myconfig"));
 	
 	private String downLoadPath;//下载文件路径
 
@@ -1897,11 +1897,11 @@ public abstract  class  BaseAction extends ActionSupport implements Serializable
 	public void setDownLoadPath(String downLoadPath) {
 		this.downLoadPath = downLoadPath;
 	}
-	public static ResourceBundle getRb() {
+	public static ResourceBundleWrapper getRb() {
 		return rb;
 	}
 	public static void setRb(ResourceBundle rb) {
-		BaseAction.rb = rb;
+		BaseAction.rb = new ResourceBundleWrapper(rb);
 	}
 
 	public String getPrevPageUrl() {
diff --git a/src/nis/nms/util/ResourceBundleWrapper.java b/src/nis/nms/util/ResourceBundleWrapper.java
new file mode 100644
index 0000000..10a197a
--- /dev/null
+++ b/src/nis/nms/util/ResourceBundleWrapper.java
@@ -0,0 +1,50 @@
+package nis.nms.util;
+
+import java.util.ResourceBundle;
+/**
+ * ResourceBundle包装类
+ * 解决：当配置文件没有key时抛出异常的的问题
+ * @author fang
+ *
+ */
+public class ResourceBundleWrapper {
+	private ResourceBundle rb;
+	public ResourceBundleWrapper(ResourceBundle rb) {
+		this.rb = rb;
+	}
+	
+	/**
+	 * 当配置文件中没有配置key时，返回 null
+	 * @param key
+	 * @return
+	 */
+	public String getString(String key){
+		return getString(key, null);
+	}
+
+	/**
+	 * 当配置文件中没有key时，返回 def 默认值
+	 * @param key
+	 * @param def
+	 * @return
+	 */
+	public String getString(String key,String def){
+		if(rb.containsKey(key)){
+			return rb.getString(key);
+		}
+		return def;
+	}
+	
+	
+	public boolean containsKey(String key){
+		return rb.containsKey(key);
+	}
+	
+	public ResourceBundle getRb() {
+		return rb;
+	}
+	public void setRb(ResourceBundle rb) {
+		this.rb = rb;
+	}
+	
+}