From: DRC <dcommander@users.sourceforge.net>
Date: Wed, 5 Oct 2011 21:39:59 +0000 (+0000)
Subject: The previous fix to the NullPointer issue did not work, because it was simply setting... 
X-Git-Tag: v1.1.90~100
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=979e2d1be5c84bc9a304c71673702346712243f4;p=tigervnc.git

The previous fix to the NullPointer issue did not work, because it was simply setting separator to null (not what we want.)  Fix the issue properly + fix spelling of "separator".


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4710 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/java/src/com/tigervnc/rfb/CSecurityTLS.java b/java/src/com/tigervnc/rfb/CSecurityTLS.java
index 2fbd5aab..73eb6199 100644
--- a/java/src/com/tigervnc/rfb/CSecurityTLS.java
+++ b/java/src/com/tigervnc/rfb/CSecurityTLS.java
@@ -106,8 +106,8 @@ public class CSecurityTLS extends CSecurity {
       return;
     }
 
-    String vnchomedir = homeDir+UserPrefs.getFileSeperator()+".vnc"+
-                        UserPrefs.getFileSeperator();
+    String vnchomedir = homeDir+UserPrefs.getFileSeparator()+".vnc"+
+                        UserPrefs.getFileSeparator();
     String caDefault = new String(vnchomedir+"x509_ca.pem");
     String crlDefault = new String(vnchomedir+"x509_crl.pem");
 
diff --git a/java/src/com/tigervnc/vncviewer/UserPrefs.java b/java/src/com/tigervnc/vncviewer/UserPrefs.java
index f72ed5ab..bc2cf0f1 100644
--- a/java/src/com/tigervnc/vncviewer/UserPrefs.java
+++ b/java/src/com/tigervnc/vncviewer/UserPrefs.java
@@ -39,7 +39,7 @@ import javax.swing.filechooser.*;
  */
 
 public class UserPrefs extends Properties {
-	String userhome=null; //This will have fileseperator on end if it
+	String userhome=null; //This will have fileseparator on end if it
 	String prefFile;
 	String appName;
 	
@@ -65,7 +65,7 @@ public class UserPrefs extends Properties {
 		}
 		// This is guaranteed as always being some valid directory,
 		// according to spec.
-		prefFile= getHomeDir()+getFileSeperator()+
+		prefFile= getHomeDir()+getFileSeparator()+
                 "."+appName;
 		try {
 			load(new java.io.FileInputStream(prefFile));
@@ -157,14 +157,14 @@ public class UserPrefs extends Properties {
     return userName;
   }
 
-  final public static String getFileSeperator() {
-    String seperator = null;
+  final public static String getFileSeparator() {
+    String separator = null;
 		try {
-			seperator = (String)System.getProperties().get("file.separator");
+			separator = Character.toString(java.io.File.separatorChar);
 		} catch(java.security.AccessControlException e) {
 			System.out.println("Cannot access file.separator system property");
 		}
-    return seperator;
+    return separator;
   }
 
 	/**