Merge 'trunk' into 'DBIx-Class-current'

[dbsrgits/DBIx-Class-Historic.git] / lib / DBIx / Class / Storage / DBI / Cursor.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm
index 26dca84..770608c 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Cursor.pm
+++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm
@@ -30,8 +30,6 @@ information.
 
 =head2 new
 
-=back
-
 Returns a new L<DBIx::Class::Storage::DBI::Cursor> object.
 
 =cut
@@ -57,7 +55,7 @@ sub new {
 
 =over 4
 
-=item Arguments: (none)
+=item Arguments: none
 
 =item Return Value: \@row_columns
 
@@ -99,7 +97,7 @@ sub next {
 
 =over 4
 
-=item Arguments: (none)
+=item Arguments: none
 
 =item Return Value: \@row_columns+
 
@@ -123,8 +121,6 @@ sub all {
 
 =head2 reset
 
-=back
-
 Resets the cursor to the beginning of the L<DBIx::Class::ResultSet>.
 
 =cut
@@ -164,7 +160,7 @@ sub DESTROY {
   my ($self) = @_;
 
   $self->_check_forks_threads;
-  $self->{sth}->finish if $self->{sth}->{Active};
+  $self->{sth}->finish if $self->{sth} && $self->{sth}->{Active};
 }
 
 1;