[TIMOB-25471] Improve KrollProxy validation

tidev · Nov 1, 2017 · e58670c · e58670c
1 parent da0ca41
commit e58670c
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java b/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
@@ -577,7 +577,10 @@ public void setIndexedProperty(int index, Object value)
 	 */
 	public boolean hasProperty(String name)
 	{
-		return properties.containsKey(name);
+		if (properties != null) {
+			return properties.containsKey(name);
+		}
+		return false;
 	}
 
 	/**
@@ -587,7 +590,10 @@ public boolean hasProperty(String name)
 	 */
 	public boolean hasPropertyAndNotNull(String name)
 	{
-		return properties.containsKeyAndNotNull(name);
+		if (properties != null) {
+			return properties.containsKeyAndNotNull(name);
+		}
+		return false;
 	}
 
 	/**
@@ -599,7 +605,10 @@ public boolean hasPropertyAndNotNull(String name)
 	 */
 	public Object getProperty(String name)
 	{
-		return properties.get(name);
+		if (properties != null) {
+			return properties.get(name);
+		}
+		return null;
 	}
 
 	/**
@@ -608,6 +617,10 @@ public Object getProperty(String name)
 	 */
 	public void setProperty(String name, Object value)
 	{
+		if (properties == null) {
+			return;
+		}
+
 		properties.put(name, value);
 
 		if (KrollRuntime.getInstance().isRuntimeThread()) {
@@ -826,7 +839,7 @@ public boolean fireSyncEvent(String event, Object data, long maxTimeout)
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public boolean doFireEvent(String event, Object data)
 	{
-		if (!hierarchyHasListener(event)) {
+		if (!hierarchyHasListener(event) || eventListeners == null) {
 			return false;
 		}