Merge pull request #147 from AuthorizeNet/future

Changes for Release 1.9.8

Author: gnongsie

.classpath

@@ -12,5 +12,6 @@
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/jmock-2.6.0.jar"/>
+	<classpathentry kind="lib" path="lib/gson-2.3.1.jar" />
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

lib/gson-2.3.1.jar

@@ -85,6 +85,7 @@
     		<groupId>com.google.code.gson</groupId>
     		<artifactId>gson</artifactId>
     		<version>2.3.1</version>
+			<scope>compile</scope>
 		</dependency>    
     </dependencies>
     <properties>

pom.xml

@@ -24,48 +24,56 @@ public class SensitiveFilterLayout extends PatternLayout{
 	private static Gson gson;
 
 	public SensitiveFilterLayout() throws UnsupportedEncodingException, FileNotFoundException, IOException {
-		GsonBuilder gsonBuilder = new GsonBuilder();
-		gsonBuilder.registerTypeAdapter(SensitiveDataConfigType.class, new SensitiveTagsDeserializer());
-		gson = gsonBuilder.create();
-			
-		InputStream in = getClass().getResourceAsStream("/AuthorizedNetSensitiveTagsConfig.json"); 
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-			SensitiveDataConfigType configType = gson.fromJson(reader, SensitiveDataConfigType.class);
-			cardPatterns = new Pattern[configType.sensitiveStringRegexes.length];
+		try {
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.registerTypeAdapter(SensitiveDataConfigType.class, new SensitiveTagsDeserializer());
+			gson = gsonBuilder.create();
+				
+			InputStream in = getClass().getResourceAsStream("/AuthorizedNetSensitiveTagsConfig.json"); 
+			BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+				SensitiveDataConfigType configType = gson.fromJson(reader, SensitiveDataConfigType.class);
+				cardPatterns = new Pattern[configType.sensitiveStringRegexes.length];
 
-	      for(int i = 0; i < configType.sensitiveStringRegexes.length; i++) {  
-		    	  cardPatterns[i] = Pattern.compile(configType.sensitiveStringRegexes[i]);
-		      }
-		      
-			int noOfSensitiveTags = configType.sensitiveTags.length;
-			tagPatterns     = new Pattern[noOfSensitiveTags];
-		    tagReplacements = new String[noOfSensitiveTags];
-     		      
-             for(int j=0; j<noOfSensitiveTags; j++) {
-		    	  String tagName     = configType.sensitiveTags[j].tagName;
-		    	  String pattern     = configType.sensitiveTags[j].pattern;
-		    	  String replacement = configType.sensitiveTags[j].replacement;
-		    	  
-		    	  if(pattern != null && !pattern.isEmpty())
-		    		  tagPatterns[j] = Pattern.compile("<"+tagName+">"+pattern+"</"+tagName+">");
-		    	  else
-		    		  tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+"</"+tagName+">");
-		    	  tagReplacements[j] = "<"+tagName+">"+replacement+"</"+tagName+">";
-		      }
-             if(reader!=null)
-            	 reader.close();
+			  for(int i = 0; i < configType.sensitiveStringRegexes.length; i++) {  
+					  cardPatterns[i] = Pattern.compile(configType.sensitiveStringRegexes[i]);
+				  }
+				  
+				int noOfSensitiveTags = configType.sensitiveTags.length;
+				tagPatterns     = new Pattern[noOfSensitiveTags];
+				tagReplacements = new String[noOfSensitiveTags];
+					  
+				 for(int j=0; j<noOfSensitiveTags; j++) {
+					  String tagName     = configType.sensitiveTags[j].tagName;
+					  String pattern     = configType.sensitiveTags[j].pattern;
+					  String replacement = configType.sensitiveTags[j].replacement;
+					  
+					  if(pattern != null && !pattern.isEmpty())
+						  tagPatterns[j] = Pattern.compile("<"+tagName+">"+pattern+"</"+tagName+">");
+					  else
+						  tagPatterns[j] = Pattern.compile("<"+tagName+">"+".+"+"</"+tagName+">");
+					  tagReplacements[j] = "<"+tagName+">"+replacement+"</"+tagName+">";
+				  }
+				 if(reader!=null)
+					 reader.close();
+		}
+		catch(Exception e){
+		}		
 	}
 
 	@Override
 	public String format(LoggingEvent event) {
-		if(event.getMessage() instanceof String) {
-			String message = event.getRenderedMessage();
-			String maskXmlMessage = SensitiveFilterLayout.maskSensitiveXmlString(message);
-			String maskCardNumber = SensitiveFilterLayout.maskCreditCards(maskXmlMessage);
-			
-			Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation().getThrowable() : null;
-			LoggingEvent maskedEvent = new LoggingEvent(event.fqnOfCategoryClass, Logger.getLogger(event.getLoggerName()), event.timeStamp, event.getLevel(), maskCardNumber, throwable);			
-			return super.format(maskedEvent);
+		try {
+			if(event.getMessage() instanceof String) {
+				String message = event.getRenderedMessage();
+				String maskXmlMessage = SensitiveFilterLayout.maskSensitiveXmlString(message);
+				String maskCardNumber = SensitiveFilterLayout.maskCreditCards(maskXmlMessage);
+				
+				Throwable throwable = event.getThrowableInformation() != null ? event.getThrowableInformation().getThrowable() : null;
+				LoggingEvent maskedEvent = new LoggingEvent(event.fqnOfCategoryClass, Logger.getLogger(event.getLoggerName()), event.timeStamp, event.getLevel(), maskCardNumber, throwable);			
+				return super.format(maskedEvent);
+			}		
+		}
+		catch(Exception e){
 		}		
 		return null;
 	}