Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	19 May 2008 13:51:28 -0000	1.36
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	16 Jun 2008 11:45:44 -0000	1.37
@@ -189,12 +189,13 @@
       #my log "--CONN ns_conn url"
       set url [ns_conn url]
     }
-    #my log "--i [self args] URL='$url'"
+    #my log "--i [self args] URL='$url', pkg=$package_id"
 
     # create connection context if necessary
     if {$package_id == 0} {
       array set "" [site_node::get_from_url -url $url]
       set package_id $(package_id)
+      my log "--i setting pkg tp $package_id"
     } 
 
     # get locale; TODO at some time, we should get rid of the ad_conn init problem
@@ -217,16 +218,19 @@
 	  -actual_query $actual_query \
           -locale $locale \
           -url $url
+      #::xo::show_stack
       #my log "--cc ::xo::cc created $url [::xo::cc serialize]"
       ::xo::cc destroy_on_cleanup
     } else {
-      #my log "--cc ::xo::cc reused $url"
+      #my log "--cc ::xo::cc reused $url -package_id $package_id"
       ::xo::cc configure \
-          -package_id $package_id \
           -url $url \
 	  -actual_query $actual_query \
           -locale $locale \
           [list -parameter_declaration $parameter]
+      if {$package_id ne ""} {
+        ::xo::cc package_id $package_id 
+      }
       ::xo::cc set_user_id $user_id
       ::xo::cc process_query_parameter
     }