[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session SessionManager.java,1.22,1.23

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30160/app/src/net/sourceforge/squirrel_sql/client/session

Modified Files:
	SessionManager.java 
Log Message:
Bug fixes and clean up

Index: SessionManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SessionManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** SessionManager.java	28 May 2006 14:06:24 -0000	1.22
--- SessionManager.java	28 May 2006 20:22:58 -0000	1.23
***************
*** 572,576 ****
     {
  
!       ArrayList buf = null;
        for (int i = 0; i < _allowedSchemaCheckers.size(); i++)
        {
--- 572,576 ----
     {
  
!       HashMap uniqueAllowedSchemas = null;
        for (int i = 0; i < _allowedSchemaCheckers.size(); i++)
        {
***************
*** 578,590 ****
           if(null != allowedSchemas)
           {
!             if(null == buf)
              {
!                buf = new ArrayList();
              }
-             buf.addAll(Arrays.asList(allowedSchemas));
           }
        }
  
!       if(null == buf)
        {
           return null;
--- 578,595 ----
           if(null != allowedSchemas)
           {
!             if(null == uniqueAllowedSchemas)
              {
!                uniqueAllowedSchemas = new HashMap();
!             }
! 
!             for (int j = 0; j < allowedSchemas.length; j++)
!             {
!                String allowedSchema = allowedSchemas[j];
!                uniqueAllowedSchemas.put(allowedSchemas[j], null);
              }
           }
        }
  
!       if(null == uniqueAllowedSchemas)
        {
           return null;
***************
*** 592,596 ****
        else
        {
!          return (String[]) buf.toArray(new String[buf.size()]);
        }
     }
--- 597,601 ----
        else
        {
!          return (String[]) uniqueAllowedSchemas.keySet().toArray(new String[uniqueAllowedSchemas.size()]);
        }
     }