patches for bugs spotted while reinstalling Phoenix server (EMinds)
This commit is contained in:
		
							parent
							
								
									372f548f7f
								
							
						
					
					
						commit
						adca4f5d91
					
				@ -239,7 +239,8 @@ class PublishedMessageImpl implements TopicMessageContext
 | 
			
		||||
	if (rs.next())
 | 
			
		||||
	  text_cache = rs.getString(1);
 | 
			
		||||
	else
 | 
			
		||||
	  return "Data Missing";  // FUTURE: throw an exception?
 | 
			
		||||
	  return "<b>[[Venice Internal Error: Data Missing]]</b>";
 | 
			
		||||
	  // FUTURE: throw an exception?
 | 
			
		||||
 | 
			
		||||
      } // end try
 | 
			
		||||
      catch (SQLException e)
 | 
			
		||||
 | 
			
		||||
@ -333,7 +333,8 @@ class TopicMessageUserContextImpl implements TopicMessageContext
 | 
			
		||||
	    if (rs.next())
 | 
			
		||||
	      text_cache = rs.getString(1);
 | 
			
		||||
	    else
 | 
			
		||||
	      return "Data Missing";  // FUTURE: throw an exception?
 | 
			
		||||
	      return "<b>[[Venice Internal Error: Data Missing]]</b>";
 | 
			
		||||
	      // FUTURE: throw an exception?
 | 
			
		||||
 | 
			
		||||
	  } // end try
 | 
			
		||||
	  finally
 | 
			
		||||
 | 
			
		||||
@ -1757,12 +1757,13 @@ class CookieControlImpl implements CookieControl
 | 
			
		||||
    { // load the cookies into a HashMap
 | 
			
		||||
      old_cookies = new HashMap();
 | 
			
		||||
      Cookie[] raw_list = httpreq.getCookies();
 | 
			
		||||
      for (int i=0; i<raw_list.length; i++)
 | 
			
		||||
      { // save off the cookies
 | 
			
		||||
	Cookie tmp = raw_list[i];
 | 
			
		||||
	old_cookies.put(tmp.getName(),tmp);
 | 
			
		||||
      if (raw_list!=null)
 | 
			
		||||
        for (int i=0; i<raw_list.length; i++)
 | 
			
		||||
        { // save off the cookies
 | 
			
		||||
	  Cookie tmp = raw_list[i];
 | 
			
		||||
	  old_cookies.put(tmp.getName(),tmp);
 | 
			
		||||
 | 
			
		||||
      } // end for
 | 
			
		||||
        } // end for and if
 | 
			
		||||
 | 
			
		||||
      if (logger.isDebugEnabled())
 | 
			
		||||
	logger.debug("loadCookies(): " + old_cookies.size() + " cookie(s) loaded");
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user