You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/10 21:34:06 UTC

[2/2] stratos git commit: Fixing NPE issue in domain mapping handler

Fixing NPE issue in domain mapping handler


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c1517c50
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c1517c50
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c1517c50

Branch: refs/heads/master
Commit: c1517c50402f23246cc37c9b9d78710116a35a49
Parents: 2c4d8b9
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Jan 11 01:51:43 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Jan 11 01:51:43 2015 +0530

----------------------------------------------------------------------
 .../apache/stratos/manager/components/DomainMappingHandler.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/c1517c50/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
index 3aaf014..75b31a8 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
@@ -123,7 +123,10 @@ public class DomainMappingHandler {
     public DomainMapping[] getDomainMappings(String applicationId, int tenantId) throws DomainMappingException {
         try {
             ApplicationSignUp applicationSignUp = applicationSignUpHandler.getApplicationSignUp(applicationId, tenantId);
-            return applicationSignUp.getDomainMappings();
+            if(applicationSignUp != null) {
+                return applicationSignUp.getDomainMappings();
+            }
+            return null;
         } catch (Exception e) {
             String message = String.format("Could not get domain mappings: [application-id] %s [tenant-id] %d",
                     applicationId, tenantId);