Result of svn merge -r68268:69863 svn+ssh://svn/svn/linden/branches/entity-router into release.

indra/lib/python/indra/ipc/llsdhttp.py

@@ -8,7 +8,6 @@
  
 import os.path
 import os
-import os
 import urlparse
 
 

indra/lib/python/indra/ipc/servicebuilder.py

@@ -23,7 +23,7 @@ def build(name, context):
     global _g_builder
     if _g_builder is None:
         _g_builder = ServiceBuilder()
-    _g_builder.buildServiceURL(name, context)
+    return _g_builder.buildServiceURL(name, context)
 
 class ServiceBuilder(object):
     def __init__(self, services_definition = services_config):

indra/lib/python/indra/util/named_query.py

@@ -56,11 +56,15 @@ def __init__(self, message):
         self.message = message
 
 class NamedQuery(object):
-    def __init__(self, filename):
+    def __init__(self, name, filename):
         self._stat_interval = 5000  # 5 seconds
+        self._name = name
         self._location = filename
         self.load_contents()
 
+    def name(self):
+        return self._name
+
     def get_modtime(self):
         return os.path.getmtime(self._location)
 
@@ -186,6 +190,6 @@ def get(self, name):
         # new up/refresh a NamedQuery based on the name
         nq = self._cached_queries.get(name)
         if nq is None:
-            nq = NamedQuery(os.path.join(self._dir, name))
+            nq = NamedQuery(name, os.path.join(self._dir, name))
             self._cached_queries[name] = nq
         return nq