Skip to content

Commit 862d75e

Browse files
authored
Merge pull request #319 from Backendless/runner_context_fields
Avoid nulls in RunnerContext's map fields.
2 parents f9b3951 + 257ed05 commit 862d75e

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/com/backendless/servercode/RunnerContext.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
public class RunnerContext extends AbstractContext
1010
{
11-
private Map missingProperties;
11+
private Map<String, Object> missingProperties = new HashMap<>();
1212
private Object prematureResult;
1313
private String eventContext;
14-
private Map<String, Object> crossHandlerData;
14+
private Map<String, Object> crossHandlerData = new HashMap<>();
1515

1616
public String getAppId()
1717
{
@@ -75,14 +75,17 @@ public void setUserRole( List<String> userRole )
7575
this.userRoles = userRole;
7676
}
7777

78-
public Map getMissingProperties()
78+
public Map<String, Object> getMissingProperties()
7979
{
8080
return missingProperties;
8181
}
8282

83-
public void setMissingProperties( Map missingProperties )
83+
public void setMissingProperties( Map<String, Object> missingProperties )
8484
{
85-
this.missingProperties = missingProperties;
85+
if( missingProperties == null )
86+
this.missingProperties = new HashMap<>();
87+
else
88+
this.missingProperties = missingProperties;
8689
}
8790

8891
public Object getPrematureResult()
@@ -122,14 +125,14 @@ public Map<String, Object> getCrossHandlerData()
122125

123126
public void setCrossHandlerData( Map<String, Object> crossHandlerData )
124127
{
125-
this.crossHandlerData = crossHandlerData;
128+
if( crossHandlerData == null )
129+
this.crossHandlerData = new HashMap<>();
130+
else
131+
this.crossHandlerData = crossHandlerData;
126132
}
127133

128134
public void addCrossHandlerData( String key, Object value )
129135
{
130-
if( this.crossHandlerData == null )
131-
this.crossHandlerData = new HashMap<>();
132-
133136
this.crossHandlerData.put( key, value );
134137
}
135138

0 commit comments

Comments
 (0)