--- google/acs.pl	2007/05/21 17:41:32	17
+++ google/acs.pl	2007/05/21 17:53:48	18
@@ -80,6 +80,20 @@
 	GetRPCMethods
 /;
 
+sub consume_queue {
+	my @results = ( SOAP::Header->name('ID' => $ID)->prefix('cwmp')->mustUnderstand(1) );
+	if ( ! @queue ) {
+		push @results, SOAP::Header->name('NoMoreRequests' => 1)->prefix('cwmp');
+	} else {
+		my $op = shift @queue;
+		push @results, SOAP::Data->name( $op )->prefix('cwmp');
+	}
+	warn "consume queue results = ", dump( @results );
+	return @results;
+}
+
+## SOAP ACS methods
+
 sub Inform {
 	my ($self, $DeviceId, $Event, $MaxEnvelopes, $CurrentTime, $RetryCount, $ParameterList, $headers) = @_;
 
@@ -115,25 +129,11 @@
 	return;
 }
 
-sub consume_queue {
-	my @results = ( SOAP::Header->name('ID' => $ID)->prefix('cwmp')->mustUnderstand(1) );
-	if ( ! @queue ) {
-		push @results, SOAP::Header->name('NoMoreRequests' => 1)->prefix('cwmp');
-	} else {
-		my $op = shift @queue;
-		push @results, SOAP::Data->name( $op )->prefix('cwmp');
-	}
-	warn "consume queue results = ", dump( @results );
-	return @results;
-}
+## special handling of empty POST request from CPE
 
 sub empty_request {
 	my (undef, $self) = @_;
 
-	if ( ! @queue ) {
-		return '';
-	}
-
     $self->serializer->soapversion(SOAP::Lite->soapversion);
     $self->serializer->xmlschema($SOAP::Constants::DEFAULT_XML_SCHEMA);
 
@@ -164,8 +164,3 @@
 	return $result;
 }
 
-sub envelope_only {
-	warn "envelope_only = ", dump( @_ );
-
-	return;
-}