[Fedora-directory-commits] admservconsole/src/com/netscape/management/admserv/logging AccessLogViewerModel.java, 1.2, 1.3

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23938/admservconsole/src/com/netscape/management/admserv/logging

Modified Files:
	AccessLogViewerModel.java 
Log Message:
Resolves: bug 166230
Bug Description: Admin Server management window misparses access log
Reviewed by: nkinder (Thanks!)
Fix Description: Look for ' - ' instead of just a '-'
Platforms tested: RHEL5
Flag Day: no
Doc impact: no



Index: AccessLogViewerModel.java
===================================================================
RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccessLogViewerModel.java	9 Jul 2007 20:10:10 -0000	1.2
+++ AccessLogViewerModel.java	11 Dec 2008 20:42:21 -0000	1.3
@@ -172,14 +172,24 @@
         int bufferLength = buffer.length();
         int state = STATE_HOST;
         char character;
+        char charNMinus1 = 0;
+        char charNMinus2 = 0;
 
         for (int index = 0; index < bufferLength; index++) {
             character = buffer.charAt(index);
+            if (index > 0) {
+                charNMinus1 = buffer.charAt(index-1);
+            }
+            if (index > 1) {
+                charNMinus2 = buffer.charAt(index-2);
+            }
             switch (state) {
             case STATE_HOST:
-                if (character == '-')
+                if ((character == ' ') && (charNMinus1 == '-') &&
+                    (charNMinus2 == ' ')) {
                     state = STATE_USERNAME;
-                else if (character != ' ')
+                }
+                else if ((character != ' ') && (charNMinus1 != ' '))
                     data.host.append(character);
                 break;