[Archive-access-cvs] SF.net SVN: archive-access:[3261] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/archivalurl/ FastArchivalUrlReplayParseEventHandler.java

[<bra...@us...>]

Revision: 3261
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3261&view=rev
Author:   bradtofel
Date:     2010-09-28 21:24:30 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
BUGFIX: checks that jspInsert value is set before accessing with NPE

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/FastArchivalUrlReplayParseEventHandler.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/FastArchivalUrlReplayParseEventHandler.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/FastArchivalUrlReplayParseEventHandler.java	2010-09-28 21:23:49 UTC (rev 3260)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/FastArchivalUrlReplayParseEventHandler.java	2010-09-28 21:24:30 UTC (rev 3261)
@@ -166,22 +166,24 @@
 				if(tagName.equals(FRAMESET_TAG)) {
 					// don't put the insert in framsets:
 				} else {
-					String tmp = null; 
-					try {
-						tmp = 
-							context.getJspExec().jspToString(jspInsertPath);
-					} catch (ServletException e) {
-						e.printStackTrace();
+					if(jspInsertPath != null) {
+						String tmp = null; 
+						try {
+							tmp = 
+								context.getJspExec().jspToString(jspInsertPath);
+						} catch (ServletException e) {
+							e.printStackTrace();
+						}
+						if (tagName.equals(BODY_TAG)) {
+							// insert it now, *after* the current Tag:
+							postEmit = tmp;
+						} else {
+							// hrm... we are seeing a node that should be in
+							// the body.. lets emit the jsp now, *before*
+							// the current Tag:
+							preEmit = tmp;
+						}
 					}
-					if (tagName.equals(BODY_TAG)) {
-						// insert it now, *after* the current Tag:
-						postEmit = tmp;
-					} else {
-						// hrm... we are seeing a node that should be in
-						// the body.. lets emit the jsp now, *before*
-						// the current Tag:
-						preEmit = tmp;
-					}
 				}
 				context.putData(FERRET_DONE_KEY,"");
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.