[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5905] trunk/sql12/plugins/hibernate/src/main/java /net/sourceforge/squirrel_sql/plugins/hibernate

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

Revision: 5905
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5905&view=rev
Author:   gerdwagner
Date:     2010-10-01 23:48:25 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Hibernate Plugin: Small fixes

Modified Paths:
--------------
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2010-09-30 21:12:27 UTC (rev 5904)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2010-10-01 23:48:25 UTC (rev 5905)
@@ -47,7 +47,24 @@
    {
       try
       {
-         return _hibernateServerConnection.generateSQL(hqlQuery);
+         if (_process)
+         {
+            SecurityManager old =System.getSecurityManager();
+
+            try
+            {
+               System.setSecurityManager(_rmiSecurityManager);
+               return _hibernateServerConnection.generateSQL(hqlQuery);
+            }
+            finally
+            {
+               System.setSecurityManager(old);
+            }
+         }
+         else
+         {
+            return _hibernateServerConnection.generateSQL(hqlQuery);
+         }
       }
       catch (RemoteException e)
       {
@@ -100,8 +117,28 @@
          if(null == _mappedClassInfos)
          {
             _mappedClassInfos = new ArrayList<MappedClassInfo>();
-            ArrayList<MappedClassInfoData> mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
 
+            ArrayList<MappedClassInfoData> mappedClassInfoData;
+            if (_process)
+            {
+               SecurityManager old =System.getSecurityManager();
+
+               try
+               {
+                  System.setSecurityManager(_rmiSecurityManager);
+                  mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
+               }
+               finally
+               {
+                  System.setSecurityManager(old);
+               }
+
+            }
+            else
+            {
+               mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
+            }
+
             for (MappedClassInfoData aMappedClassInfoData : mappedClassInfoData)
             {
                _mappedClassInfos.add(new MappedClassInfo(aMappedClassInfoData));

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2010-09-30 21:12:27 UTC (rev 5904)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2010-10-01 23:48:25 UTC (rev 5905)
@@ -51,6 +51,12 @@
    public Object get(int columnIndex) throws DataSetException
    {
       Object obj = _singleType.getResults().get(_curIx).getObject();
+
+      if(null == obj)
+      {
+         return "<object is null>";
+      }
+
       HibernatePropertyReader hpr = new HibernatePropertyReader(_columnDisplayDefinitions[columnIndex].getColumnName(), obj);
 
       Object value = hpr.getValue();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.