You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/01/09 17:17:05 UTC
svn commit: r1229236 -
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Author: gawor
Date: Mon Jan 9 16:17:05 2012
New Revision: 1229236
URL: http://svn.apache.org/viewvc?rev=1229236&view=rev
Log:
do bundle update if osgi application only contains one bundle
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java?rev=1229236&r1=1229235&r2=1229236&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java Mon Jan 9 16:17:05 2012
@@ -712,11 +712,19 @@ public class GeronimoServerBehaviourDele
public boolean hasChangedChildModulesOnly(boolean allChangedAllowed) {
int changed = getChangedChildModulesOnly();
- if (allChangedAllowed) {
- return (changed > 0);
- } else {
- return (changed > 0 && changed < children.size());
+ if (changed > 0) {
+ if (allChangedAllowed) {
+ return true;
+ } else {
+ if (children.size() == 1) {
+ // special case: always return true if module only has one child module
+ return true;
+ } else {
+ return (changed < children.size());
+ }
+ }
}
+ return false;
}
/*