Author: sebb
Date: Fri Apr 24 20:49:47 2009
New Revision: 768414

URL: http://svn.apache.org/viewvc?rev=768414&view=rev
Log:
Oops - avoid NPE if os.name has no space in it.
Props to Milamber, see Bug 47064

Modified:
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=768414&r1=768413&r2=768414&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
 Fri Apr 24 20:49:47 2009
@@ -73,8 +73,8 @@
         if (laf != null) {
             return laf;
         }
-        String osFamily = osName.substring(0, osName.indexOf(' '));// e.g. 
windows xp => windows
-        laf = JMeterUtils.getProperty(JMETER_LAF+"."+osFamily);
+        String[] osFamily = osName.split("\\s"); // e.g. windows xp => windows
+        laf = JMeterUtils.getProperty(JMETER_LAF+"."+osFamily[0]);
         if (laf != null) {
             return laf;
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to