You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/19 05:28:40 UTC
[2/2] stratos git commit: Fix array copying issue and a minor typo
Fix array copying issue and a minor typo
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0746eccf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0746eccf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0746eccf
Branch: refs/heads/master
Commit: 0746eccfd51cd15e46b482f7a1c6aadef1c88bfb
Parents: 5936be2
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Mar 19 09:57:53 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Mar 19 09:57:53 2015 +0530
----------------------------------------------------------------------
.../common/beans/application/SubscribableInfo.java | 10 +++++-----
.../stratos/common/beans/cartridge/PersistenceBean.java | 2 +-
.../rest/endpoint/util/converter/ObjectConverter.java | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0746eccf/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
index b0686f5..95d5dc8 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
@@ -41,7 +41,7 @@ public class SubscribableInfo implements Serializable {
private String[] dependencyAliases;
private ArtifactRepositoryBean artifactRepository;
private List<PropertyBean> property;
- private PersistenceBean persistenceBean;
+ private PersistenceBean persistence;
public String getAlias() {
return alias;
@@ -107,11 +107,11 @@ public class SubscribableInfo implements Serializable {
this.artifactRepository = artifactRepository;
}
- public PersistenceBean getPersistenceBean() {
- return persistenceBean;
+ public PersistenceBean getPersistence() {
+ return persistence;
}
- public void setPersistenceBean(PersistenceBean persistenceBean) {
- this.persistenceBean = persistenceBean;
+ public void setPersistence(PersistenceBean persistence) {
+ this.persistence = persistence;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0746eccf/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
index a2bfedc..7a3a2d7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
@@ -19,8 +19,8 @@
package org.apache.stratos.common.beans.cartridge;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "persistence")
public class PersistenceBean {
http://git-wip-us.apache.org/repos/asf/stratos/blob/0746eccf/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 969f10d..98a2553 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
@@ -1320,7 +1320,7 @@ public class ObjectConverter {
persistenceBean.setRequired(persistenceContext.getPersistenceRequired());
persistenceBean.setVolume(convertStubVolumeToVolume(persistenceContext.getVolumes()));
- subscribableInfo.setPersistenceBean(persistenceBean);
+ subscribableInfo.setPersistence(persistenceBean);
}
return subscribableInfo;
}
@@ -1402,8 +1402,8 @@ public class ObjectConverter {
infoContext.setArtifactRepositoryContext(artifactRepositoryContext);
}
- if (subscribableInfo.getPersistenceBean() != null){
- PersistenceBean persistenceBean = subscribableInfo.getPersistenceBean();
+ if (subscribableInfo.getPersistence() != null){
+ PersistenceBean persistenceBean = subscribableInfo.getPersistence();
PersistenceContext persistenceContext = new PersistenceContext();
persistenceContext.setPersistenceRequired(persistenceBean.isRequired());
@@ -1429,7 +1429,7 @@ public class ObjectConverter {
volumeContexts.add(volumeContext);
}
- return (VolumeContext[]) volumeContexts.toArray();
+ return volumeContexts.toArray(new VolumeContext[volumeContexts.size()]);
}
private static org.apache.stratos.autoscaler.stub.Properties convertPropertyBeansToStubProperties(