--- Webpacus/lib/Webpacus/Model/WebPAC.pm	2006/03/23 12:28:26	424
+++ Webpacus/lib/Webpacus/Model/WebPAC.pm	2006/03/26 18:18:01	425
@@ -152,10 +152,10 @@
 sub setup_site {
 	my $self = shift;
 
-	my $site = shift;
+	my $site = shift || $self->{defaultnode};
 	if (! $site) {
-		$site = $self->{defaultnode};
-		$self->{log}->warn("using default site $site");
+		$self->{log}->warn("not changing site from " . $self->{est_node}->{url});
+		return;
 	}
 
 	$self->{log}->fatal("setup_site can't find site or defaultnode") unless ($site);
@@ -450,15 +450,18 @@
 sub list_nodes {
 	my $self = shift;
 
-	my $site = shift;
+	my $site = shift || $self->{defaultnode};
+
+	# cache?
+	if ($nodes_list->{$site} && ref($nodes_list->{$site} eq 'ARRAY')) {
+		$self->{log}->debug("list_nodes for site $site and returns from cache");
+		return @{ $nodes_list->{$site} };
+	};
 
-	$self->{log}->debug("list_nodes use site $site");
+	$self->{log}->debug("list_nodes for site $site");
 
 	$self->setup_site( $site );
 
-	# cache?
-	return @{ $nodes_list->{$site} } if ($nodes_list->{$site} && ref($nodes_list->{$site} eq 'ARRAY'));
-
 	my @nodes;
 
 	if ($self->{est_node}->doc_num > 0) {