summaryrefslogtreecommitdiff
path: root/desktop/source/registration/com/sun/star
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2010-01-14 09:08:51 +0000
committerOliver Bolte <obo@openoffice.org>2010-01-14 09:08:51 +0000
commit549e13cfc0a2ba551f9d8ac6b9d21045d16c734f (patch)
treec9d87b84c98d02dc9d8a3c98d4650ea1f0337d23 /desktop/source/registration/com/sun/star
parent2e721139bbe2cd057d3596b50ef97d34dc190942 (diff)
CWS-TOOLING: integrate CWS fwk136
2010-01-12 14:48:41 +0100 cd r277899 : #108263# Fix problem with empty system values which need to be intergers. Use 0 to reflect unknown.
Diffstat (limited to 'desktop/source/registration/com/sun/star')
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java29
1 files changed, 21 insertions, 8 deletions
diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index badf5bbbfd..d218650ee5 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
@@ -95,12 +95,12 @@ public class SystemEnvironment {
this.systemManufacturer = "";
this.cpuManufacturer = "";
this.serialNumber = "";
- this.physmem = "";
- this.sockets = "";
- this.cores = "";
- this.virtcpus = "";
+ this.physmem = "0";
+ this.sockets = "0";
+ this.cores = "0";
+ this.virtcpus = "0";
this.cpuname = "";
- this.clockrate = "";
+ this.clockrate = "0";
}
@@ -173,6 +173,8 @@ public class SystemEnvironment {
* @param physmem The physmem to set.
*/
public void setPhysMem(String physmem) {
+ if (physmem.length() == 0)
+ physmem = "0";
this.physmem = physmem;
}
@@ -181,6 +183,8 @@ public class SystemEnvironment {
* @param sockets The sockets to set.
*/
public void setSockets(String sockets) {
+ if (sockets.length() == 0)
+ sockets = "0";
this.sockets = sockets;
}
@@ -189,6 +193,8 @@ public class SystemEnvironment {
* @param cores The cores to set.
*/
public void setCores(String cores) {
+ if (cores.length() == 0)
+ cores ="0";
this.cores = cores;
}
@@ -197,6 +203,8 @@ public class SystemEnvironment {
* @param virtcpus The virtcpus to set.
*/
public void setVirtCpus(String virtcpus) {
+ if (virtcpus.length() == 0)
+ virtcpus = "0";
this.virtcpus = virtcpus;
}
@@ -213,9 +221,14 @@ public class SystemEnvironment {
* @param clockrate The clockrate to set.
*/
public void setClockRate(String clockrate) {
- Float f = Float.parseFloat(clockrate);
- Integer nClockrate = f.intValue();
- this.clockrate = nClockrate.toString();
+ if (clockrate.length() == 0)
+ this.clockrate = "0";
+ else
+ {
+ Float f = Float.parseFloat(clockrate);
+ Integer nClockrate = f.intValue();
+ this.clockrate = nClockrate.toString();
+ }
}
/**