From bdefeced241380db22a189c1d6568e4ab019d137 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 05 Oct 2007 13:20:51 +0000
Subject: [PATCH] Fix for issue #2404 (ds-start --systemInfo does not detect 64 bits amd64 Solaris 10)
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 14 ++++++++++++++
opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java | 14 ++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 3b16af3..39beb04 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -9136,6 +9136,20 @@
System.getProperty("os.name") + " " +
System.getProperty("os.version") + " " +
System.getProperty("os.arch"));
+ String sunOsArchDataModel = System.getProperty("sun.arch.data.model");
+ if (sunOsArchDataModel != null)
+ {
+ System.out.print ("JVM Architecture: " + sunOsArchDataModel);
+ if (! sunOsArchDataModel.toLowerCase().equals("unknown"))
+ {
+ System.out.print("-bit");
+ }
+ System.out.println();
+ }
+ else
+ {
+ System.out.println("JVM Architecture: unknown");
+ }
try
{
diff --git a/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
index 0f7d4ea..53899fa 100644
--- a/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -165,6 +165,20 @@
System.getProperty("os.version") + " " +
System.getProperty("os.arch");
attrs.add(createAttribute("operatingSystem", osInfo));
+ String sunOsArchDataModel = System.getProperty("sun.arch.data.model");
+ if (sunOsArchDataModel != null)
+ {
+ String jvmArch = sunOsArchDataModel;
+ if (! sunOsArchDataModel.toLowerCase().equals("unknown"))
+ {
+ jvmArch += "-bit";
+ }
+ attrs.add(createAttribute("jvmArchitecture", jvmArch));
+ }
+ else
+ {
+ attrs.add(createAttribute("jvmArchitecture","unknown"));
+ }
try
{
--
Gitblit v1.10.0