[Sblim-commit] cim-client/org/sblim/wbem/util SessionProperties.java, 1.12.2.1, 1.12.2.2

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/cim-client/org/sblim/wbem/util
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16582/org/sblim/wbem/util

Modified Files:
      Tag: CIM_CLIENT_1_3_9_M
	SessionProperties.java 
Log Message:
3160431 - Need to support property file on AIX.

Index: SessionProperties.java
===================================================================
RCS file: /cvsroot/sblim/cim-client/org/sblim/wbem/util/SessionProperties.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- SessionProperties.java	29 Sep 2010 22:42:55 -0000	1.12.2.1
+++ SessionProperties.java	18 Jan 2011 16:10:12 -0000	1.12.2.2
@@ -1,7 +1,7 @@
 /**
  * SessionProperties.java
  *
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -31,6 +31,7 @@
  * 2372679    2008-12-01  blaschke-oss Add property to control synchronized SSL handshaking
  * 2807325    2009-06-22  blaschke-oss Change licensing from CPL to EPL
  * 3078216    2010-09-29  blaschke-oss Fix for a null pointer exception in 1.3.9.1
+ * 3160431    2011-01-18  blaschke-oss Need to support property file on AIX.
  */
 package org.sblim.wbem.util;
 
@@ -161,7 +162,7 @@
 
 	private static final String FILE_DEFAULT_PROPERTIES = "cim.defaults"; //$NON-NLS-1$
 
-	private static final String LINUX_SBLIM_CIM_CLIENT_PROPERTIES = "/etc/java/sblim-cim-client.properties"; //$NON-NLS-1$
+	private static final String UNIX_SBLIM_CIM_CLIENT_PROPERTIES = "/etc/java/sblim-cim-client.properties"; //$NON-NLS-1$
 
 	private static final int DEFAULT_HTTP_TIME_OUT = 0;
 
@@ -1588,11 +1589,12 @@
 				return true;
 			}
 			
-			if (System.getProperty("os.name").equalsIgnoreCase("Linux")) {
-				file = new File(LINUX_SBLIM_CIM_CLIENT_PROPERTIES).getAbsoluteFile();
+			if (System.getProperty("os.name").equalsIgnoreCase("Linux")
+					|| System.getProperty("os.name").equalsIgnoreCase("AIX")) {
+				file = new File(UNIX_SBLIM_CIM_CLIENT_PROPERTIES).getAbsoluteFile();
 				if (file.exists()) {
 					load(new FileInputStream(file));
-					propertyFile = LINUX_SBLIM_CIM_CLIENT_PROPERTIES;
+					propertyFile = UNIX_SBLIM_CIM_CLIENT_PROPERTIES;
 					return true;
 				}
 			}