You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/03/25 06:59:19 UTC

stratos git commit: fix Number format exception when volumeid is specified

Repository: stratos
Updated Branches:
  refs/heads/master bddd48bd2 -> 69a5eb322


fix Number format exception when volumeid is specified


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

Branch: refs/heads/master
Commit: 69a5eb322b4d7edfa7fbfb6f834abb192a326d11
Parents: bddd48b
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Mar 25 11:29:03 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Mar 25 11:29:03 2015 +0530

----------------------------------------------------------------------
 .../stratos/rest/endpoint/util/converter/ObjectConverter.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/69a5eb32/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index eeef6c3..eff8097 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -1477,7 +1477,12 @@ public class ObjectConverter {
             volumeContext.setVolumeId(volumeBean.getVolumeId());
             volumeContext.setMappingPath(volumeBean.getMappingPath());
             volumeContext.setDevice(volumeBean.getDevice());
-            volumeContext.setSize(Integer.parseInt(volumeBean.getSize()));
+
+            // When volumeId is specified, volume size is not relavent.
+            if(volumeBean.getSize() != null){
+                volumeContext.setSize(Integer.parseInt(volumeBean.getSize()));
+            }
+
             volumeContext.setSnapshotId(volumeBean.getSnapshotId());
             volumeContext.setId(volumeBean.getId());