From: <st...@us...> - 2008-02-14 15:47:42
|
Revision: 5961 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5961&view=rev Author: steve_l Date: 2008-02-14 07:47:37 -0800 (Thu, 14 Feb 2008) Log Message: ----------- SFOS-668 implement regexp validation of remote web pages fetched with the LivenessPage component -here all groups get saved Modified Paths: -------------- trunk/core/components/www/src/org/smartfrog/services/www/LivenessPageChecker.java Modified: trunk/core/components/www/src/org/smartfrog/services/www/LivenessPageChecker.java =================================================================== --- trunk/core/components/www/src/org/smartfrog/services/www/LivenessPageChecker.java 2008-02-14 15:44:09 UTC (rev 5960) +++ trunk/core/components/www/src/org/smartfrog/services/www/LivenessPageChecker.java 2008-02-14 15:47:37 UTC (rev 5961) @@ -454,7 +454,7 @@ */ private void postProcess(int responseCode, String response, String body) throws SmartFrogLivenessException { - if(logResponse) { + if (logResponse) { log.info(body); } if (responsePattern != null) { @@ -463,28 +463,28 @@ throw new SmartFrogLivenessException(ERROR_NO_MATCH + responseRegexp + "\n" + body); } - if (owner != null && matcher.groupCount() > 0) { - String group1 = matcher.group(1); - log.info("Matched response: "+group1); - try { - owner.sfReplaceAttribute("group1", group1); - } catch (SmartFrogRuntimeException e) { - log.ignore(FAILED_TO_REPLACE_ATTRIBUTE, e); - } catch (RemoteException e) { - log.ignore(FAILED_TO_REPLACE_ATTRIBUTE, e); + try { + if (owner != null) { + for (int i = 0; i < matcher.groupCount(); i++) { + String group = matcher.group(1); + log.info("Matched response group" + i + ": " + group); + owner.sfReplaceAttribute("group" + i, group); + } } - + } catch (SmartFrogRuntimeException e) { + log.ignore(FAILED_TO_REPLACE_ATTRIBUTE, e); + } catch (RemoteException e) { + log.ignore(FAILED_TO_REPLACE_ATTRIBUTE, e); } } } - - /** - * fetch error text if configured to do so, otherwise return an empty string - * - * @param connection a connection that can be null if it so chooses. - * @return "" or remote error text - */ +/** +* fetch error text if configured to do so, otherwise return an empty string +* +* @param connection a connection that can be null if it so chooses. +* @return "" or remote error text +*/ protected String maybeGetErrorText(HttpURLConnection connection) { if (connection == null) { return ERROR_NO_CONNECTION; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |