amy/venice-main-classic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patches for bugs spotted while reinstalling Phoenix server (EMinds)

Browse Source
This commit is contained in:
Eric J. Bowersox 2004-04-04 23:19:27 +00:00
parent 372f548f7f
commit adca4f5d91
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java
View File

@ -239,7 +239,8 @@ class PublishedMessageImpl implements TopicMessageContext
if (rs.next()) if (rs.next())
text_cache = rs.getString(1); text_cache = rs.getString(1);
else else
return "Data Missing"; // FUTURE: throw an exception? return "<b>[[Venice Internal Error: Data Missing]]</b>";
// FUTURE: throw an exception?
} // end try } // end try
catch (SQLException e) catch (SQLException e)

3
src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java
View File

@ -333,7 +333,8 @@ class TopicMessageUserContextImpl implements TopicMessageContext
if (rs.next()) if (rs.next())
text_cache = rs.getString(1); text_cache = rs.getString(1);
else else
return "Data Missing"; // FUTURE: throw an exception? return "<b>[[Venice Internal Error: Data Missing]]</b>";
// FUTURE: throw an exception?
} // end try } // end try
finally finally

11
src/com/silverwrist/venice/ui/servlet/RequestImpl.java
View File

@ -1757,12 +1757,13 @@ class CookieControlImpl implements CookieControl
{ // load the cookies into a HashMap { // load the cookies into a HashMap
old_cookies = new HashMap(); old_cookies = new HashMap();
Cookie[] raw_list = httpreq.getCookies(); Cookie[] raw_list = httpreq.getCookies();
for (int i=0; i<raw_list.length; i++) if (raw_list!=null)
{ // save off the cookies for (int i=0; i<raw_list.length; i++)
Cookie tmp = raw_list[i]; { // save off the cookies
old_cookies.put(tmp.getName(),tmp); Cookie tmp = raw_list[i];
old_cookies.put(tmp.getName(),tmp);
} // end for } // end for and if
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("loadCookies(): " + old_cookies.size() + " cookie(s) loaded"); logger.debug("loadCookies(): " + old_cookies.size() + " cookie(s) loaded");