From 45b172f21bd3c5c4cf9616d29795eead3e75ada8 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Tue, 14 May 2002 16:43:03 +0000
Subject: [PATCH] Only set path-lookup-by-prototype if the object in the path
 actually does have a prototype. Previously this threw a NullPointerException
 for untyped path elements.

Enabled printing of stack trace for errors within invoke().
---
 src/helma/scripting/fesi/FesiEvaluator.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/helma/scripting/fesi/FesiEvaluator.java b/src/helma/scripting/fesi/FesiEvaluator.java
index ae8ed18f..0097f0ec 100644
--- a/src/helma/scripting/fesi/FesiEvaluator.java
+++ b/src/helma/scripting/fesi/FesiEvaluator.java
@@ -230,11 +230,14 @@ public class FesiEvaluator {
 	            else if ("path".equals (k)) {
 	                ArrayPrototype parr = new ArrayPrototype (evaluator.getArrayPrototype(), evaluator);
 	                List path = (List) v;
+	                // register path elements with their prototype
 	                for (int j=0; j<path.size(); j++) {
 	                    Object pathElem = path.get (j);
 	                    ESValue wrappedElement = getElementWrapper (pathElem);
 	                    parr.putProperty (j, wrappedElement);
-	                    parr.putHiddenProperty (app.getPrototypeName(pathElem), wrappedElement);
+	                    String protoname = app.getPrototypeName (pathElem);
+	                    if (protoname != null)
+	                        parr.putHiddenProperty (protoname, wrappedElement);
 	                }
 	                sv = parr;
 	            } else if ("user".equals (k)) {
@@ -259,8 +262,8 @@ public class FesiEvaluator {
 	    String msg = x.getMessage ();
 	    if (msg == null || msg.length() < 10)
 	        msg = x.toString ();
-	    // System.err.println ("INVOKE-ERROR: "+msg);
-	    // x.printStackTrace ();
+	    System.err.println ("INVOKE-ERROR: "+msg);
+	    x.printStackTrace ();
 	    throw new ScriptingException (msg);
 	} finally {
 	    // remove global variables that have been added during invocation.