modules/core/domain/pom.xml | 9 +++++++++ modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
New commits: commit 53083088605af46f59ff660208594637302418d0 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Nov 2 14:33:12 2011 +0100
Add the deprecated repo of JBoss Nexus as it is needed for Hibernate.
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 164f5ad..1ebf5b0 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -527,6 +527,15 @@ </snapshots> </repository>
+ <repository> + <id>jboss-deprecated-items-group</id> + <name>JBoss Public Repository Group</name> + <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories>
</project>
commit c82c0b797ca492f8a79332fc5f54235bbc2a656c Author: Heiko W. Rupp hwr@redhat.com Date: Wed Nov 2 14:15:38 2011 +0100
We need to check if the user has actually enabled any swap at all before checking for free swap.
diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java index 88ed3a8..fad9fb6 100644 --- a/modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java +++ b/modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java @@ -184,9 +184,11 @@ public class NativeSystemInfoTest { + nf.format(allSwap.getTotal())); assert allMemory.getActualFree() > 0 : allMemory.getActualFree(); assert allMemory.getFree() > 0 : allMemory.getFree(); - assert allSwap.getFree() > 0 : allSwap.getFree(); assert allMemory.getTotal() > 1000000 : allMemory.getTotal(); - assert allSwap.getTotal() > 1000000 : allSwap.getTotal(); + if (allSwap.getTotal()>0) { + assert allSwap.getTotal() > 1000000 : allSwap.getTotal(); + assert allSwap.getFree() > 0 : allSwap.getFree(); + }
ProcMem processMemory = sigar.getProcMem(sigar.getPid());
rhq-commits@lists.fedorahosted.org