From 456e9e561126d32a4f409895f0ccc89acfdf3af8 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Dec 11 2008 20:42:21 +0000 Subject: 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 --- diff --git a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java index b9bc0cc..588e514 100644 --- a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java +++ b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java @@ -172,14 +172,24 @@ class AccessDataCommClient extends AbstractCommClient { 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;