Changeset 1331

Timestamp:

08/19/08 00:54:00 (3 years ago)

Author:

kohlhaas

Message:

closes #3

Location:

trunk/src/org/rapla

Files:

• server/internal/ServerServiceImpl.java (modified) (2 diffs)
• storage/dbsql/DBOperator.java (modified) (2 diffs)

trunk/src/org/rapla/server/internal/ServerServiceImpl.java

@@ -51 +51 @@
 import org.rapla.storage.AuthenticationStore;
 import org.rapla.storage.CachableStorageOperator;
+import org.rapla.storage.RaplaSecurityException;
 import org.rapla.storage.StorageOperator;
 import org.rapla.storage.StorageUpdateListener;
@@ -481 +482 @@
                 user = (User) this.operator.editObject( user, null );
             }
-            if ( authenticationStore.initUser( user, username, password,
+            
+            boolean initUser ;
+            try
+            {
+                initUser = authenticationStore.initUser( user, username, password,
                                                this.operator.getSuperCategory()
-                                                            .getCategory( Permission.GROUP_CATEGORY_KEY ) ) )
+                                                            .getCategory( Permission.GROUP_CATEGORY_KEY ) );
+            } catch (RaplaSecurityException ex){
+                throw new RaplaSecurityException(i18n.getString("error.login"));
+            }
+            if ( initUser )
             {
                 this.operator.storeAndRemove( new Entity[]
-                    { user }, Entity.ENTITY_ARRAY, user );
+                    { user }, Entity.ENTITY_ARRAY, null );
             }
         }

trunk/src/org/rapla/storage/dbsql/DBOperator.java

@@ -335 +335 @@
                  connection.commit();
              }
-             UpdateResult result = super.update(evt, true);
-             fireStorageUpdated(result);
-        } catch (Exception ex) {
+         } catch (Exception ex) {
              try {
                  if (bSupportsTransactions) {
@@ -358 +356 @@
             close( connection );
         }
+        UpdateResult result = super.update(evt, true);
+        fireStorageUpdated(result);
         
     }