[Red5commits] [1542] fixed broken string comparisons

[jbauch]

fixed broken string comparisons


Timestamp: 11/15/06 07:01:55 EST (2 months ago) 
Change: 1542 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/Standalone.java
java/server/trunk/src/org/red5/server/WebScope.java
java/server/trunk/src/org/red5/server/api/ScopeUtils.java
java/server/trunk/src/org/red5/server/jetty/Red5WebPropertiesConfiguration.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1542

Index: /java/server/trunk/src/org/red5/server/jetty/Red5WebPropertiesConfiguration.java
===================================================================
--- /java/server/trunk/src/org/red5/server/jetty/Red5WebPropertiesConfiguration.java (revision 1519)
+++ /java/server/trunk/src/org/red5/server/jetty/Red5WebPropertiesConfiguration.java (revision 1542)
@@ -93,8 +93,7 @@
 				for (int i = 0; i < hostnames.length; i++) {
 					hostnames[i] = hostnames[i].trim();
-					if (hostnames[i].equals('*')) {
+					if (hostnames[i].equals("*")) {
 						// A virtual host "null" must be used so requests for
-						// any host
-						// will be served.
+						// any host will be served.
 						hostnames = null;
 						break;
Index: /java/server/trunk/src/org/red5/server/WebScope.java
===================================================================
--- /java/server/trunk/src/org/red5/server/WebScope.java (revision 1519)
+++ /java/server/trunk/src/org/red5/server/WebScope.java (revision 1542)
@@ -80,5 +80,5 @@
 		for (int i = 0; i < hostnames.length; i++) {
 			hostnames[i] = hostnames[i].trim();
-			if (hostnames[i].equals('*')) {
+			if (hostnames[i].equals("*")) {
 				hostnames[i] = "";
 			}
Index: /java/server/trunk/src/org/red5/server/Standalone.java
===================================================================
--- /java/server/trunk/src/org/red5/server/Standalone.java (revision 1519)
+++ /java/server/trunk/src/org/red5/server/Standalone.java (revision 1542)
@@ -123,5 +123,5 @@
 		idx = root.lastIndexOf('/');
 		root = root.substring(0, idx);
-		if (System.getProperty("file.separator").equals('/')) {
+		if (System.getProperty("file.separator").equals("/")) {
 			// Workaround for linux systems
 			root = '/' + root;
Index: /java/server/trunk/src/org/red5/server/api/ScopeUtils.java
===================================================================
--- /java/server/trunk/src/org/red5/server/api/ScopeUtils.java (revision 1538)
+++ /java/server/trunk/src/org/red5/server/api/ScopeUtils.java (revision 1542)
@@ -66,5 +66,5 @@
 		String[] parts = path.split(SLASH);
 		for (String part : parts) {
-			if (part.equals('.')) {
+			if (part.equals(".")) {
 				continue;
 			}


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.