Index: /trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 2904)
+++ /trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 2905)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.7 2005-01-05 04:04:45 jhoblitt Exp $
+# $Id: Server.pm,v 1.8 2005-01-05 04:31:59 jhoblitt Exp $
 
 package PS::IPP::IData::Server;
@@ -128,4 +128,6 @@
             $query->execute;
             ( $ins_id ) = $query->fetchrow_array;
+
+            $query->finish;
         }
     };
@@ -194,4 +196,5 @@
 
             unless ( $rows > 0 ) {
+                $query->finish;
                 $db->rollback;
                 $log->logdie( "storage object does not exist" );
@@ -199,4 +202,5 @@
 
             $so_id = $query->fetchrow_hashref->{ 'so_id' };
+            $query->finish;
         }
 
@@ -211,4 +215,6 @@
 
             ( $ins_id ) = $query->fetchrow_array;
+
+            $query->finish;
         }
 
@@ -263,8 +269,9 @@
     my $read_lock;
     my $write_lock;
+    my $query;
 
     eval {
         # this will set update locks
-        my $query = $db->prepare_cached( $sql->get_object_locks );
+        $query = $db->prepare_cached( $sql->get_object_locks );
         my $rows = $query->execute( $key );
         unless ( $rows == 1 ) {
@@ -273,4 +280,5 @@
 
         my $row = $query->fetchrow_hashref;
+        $query->finish;
 
         $so_id      = $row->{ 'so_id' };
@@ -279,4 +287,5 @@
     };
     if ( $@ ) {
+        $query->finish;
         $db->rollback;
         $log->logdie( "database error: $@" );
@@ -375,8 +384,9 @@
     my $read_lock;
     my $write_lock;
+    my $query;
 
     eval {
         # this will set update locks
-        my $query = $db->prepare_cached( $sql->get_object_locks );
+        $query = $db->prepare_cached( $sql->get_object_locks );
         my $rows = $query->execute( $key );
         unless ( $rows == 1 ) {
@@ -385,4 +395,5 @@
 
         my $row = $query->fetchrow_hashref;
+        $query->finish;
 
         $so_id      = $row->{ 'so_id' };
@@ -391,4 +402,5 @@
     };
     if ( $@ ) {
+        $query->finish;
         $db->rollback;
         $log->logdie( "database error: $@" );
@@ -538,4 +550,5 @@
 
             $so_id = $query->fetchrow_hashref->{ 'so_id' };
+            $query->finish;
         }
 
@@ -545,4 +558,5 @@
 
             $instances = $query->fetchrow_hashref->{ 'count(ins_id)' };
+            $query->finish;
         }
 
@@ -604,4 +618,5 @@
 
         $stat = $query->fetchrow_arrayref;
+        $query->finish;
 
         $db->commit;
Index: /trunk/Nebulous/lib/Nebulous/Server.pm
===================================================================
--- /trunk/Nebulous/lib/Nebulous/Server.pm	(revision 2904)
+++ /trunk/Nebulous/lib/Nebulous/Server.pm	(revision 2905)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.7 2005-01-05 04:04:45 jhoblitt Exp $
+# $Id: Server.pm,v 1.8 2005-01-05 04:31:59 jhoblitt Exp $
 
 package PS::IPP::IData::Server;
@@ -128,4 +128,6 @@
             $query->execute;
             ( $ins_id ) = $query->fetchrow_array;
+
+            $query->finish;
         }
     };
@@ -194,4 +196,5 @@
 
             unless ( $rows > 0 ) {
+                $query->finish;
                 $db->rollback;
                 $log->logdie( "storage object does not exist" );
@@ -199,4 +202,5 @@
 
             $so_id = $query->fetchrow_hashref->{ 'so_id' };
+            $query->finish;
         }
 
@@ -211,4 +215,6 @@
 
             ( $ins_id ) = $query->fetchrow_array;
+
+            $query->finish;
         }
 
@@ -263,8 +269,9 @@
     my $read_lock;
     my $write_lock;
+    my $query;
 
     eval {
         # this will set update locks
-        my $query = $db->prepare_cached( $sql->get_object_locks );
+        $query = $db->prepare_cached( $sql->get_object_locks );
         my $rows = $query->execute( $key );
         unless ( $rows == 1 ) {
@@ -273,4 +280,5 @@
 
         my $row = $query->fetchrow_hashref;
+        $query->finish;
 
         $so_id      = $row->{ 'so_id' };
@@ -279,4 +287,5 @@
     };
     if ( $@ ) {
+        $query->finish;
         $db->rollback;
         $log->logdie( "database error: $@" );
@@ -375,8 +384,9 @@
     my $read_lock;
     my $write_lock;
+    my $query;
 
     eval {
         # this will set update locks
-        my $query = $db->prepare_cached( $sql->get_object_locks );
+        $query = $db->prepare_cached( $sql->get_object_locks );
         my $rows = $query->execute( $key );
         unless ( $rows == 1 ) {
@@ -385,4 +395,5 @@
 
         my $row = $query->fetchrow_hashref;
+        $query->finish;
 
         $so_id      = $row->{ 'so_id' };
@@ -391,4 +402,5 @@
     };
     if ( $@ ) {
+        $query->finish;
         $db->rollback;
         $log->logdie( "database error: $@" );
@@ -538,4 +550,5 @@
 
             $so_id = $query->fetchrow_hashref->{ 'so_id' };
+            $query->finish;
         }
 
@@ -545,4 +558,5 @@
 
             $instances = $query->fetchrow_hashref->{ 'count(ins_id)' };
+            $query->finish;
         }
 
@@ -604,4 +618,5 @@
 
         $stat = $query->fetchrow_arrayref;
+        $query->finish;
 
         $db->commit;