1 files changed, 24 insertions, 46 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 61cf0e4..ab6128f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -23,7 +23,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 using System;
@@ -35,7 +34,6 @@ using OpenSim.ApplicationPlugins.Rest;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
-
     /// <remarks>
     /// The class signature reveals the roles that RestHandler plays.
     ///
@@ -74,10 +72,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         /// <summary>
         /// This static initializer scans the ASSEMBLY for classes that
         /// export the IRest interface and builds a list of them. These
-        /// are later activated by the handler. To add a new handler it 
+        /// are later activated by the handler. To add a new handler it
         /// is only necessary to create a new services class that implements
         /// the IRest interface, and recompile the handler. This gives
-        /// all of the build-time flexibility of a modular approach 
+        /// all of the build-time flexibility of a modular approach
         /// while not introducing yet-another module loader. Note that
         /// multiple assembles can still be built, each with its own set
         /// of handlers. Examples of services classes are RestInventoryServices
@@ -86,13 +84,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         static RestHandler()
         {
-
             Module[] mods = Assembly.GetExecutingAssembly().GetModules();
 
             foreach (Module m in mods)
             {
                 Type[] types = m.GetTypes();
-                foreach (Type t in types) 
+                foreach (Type t in types)
                 {
                     try
                     {
@@ -108,7 +105,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                     }
                 }
             }
-
         }
 
         #endregion local static state
@@ -117,13 +113,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         /// <summary>
         /// This routine loads all of the handlers discovered during
-        /// instance initialization. 
+        /// instance initialization.
         /// A table of all loaded and successfully constructed handlers
         /// is built, and this table is then used by the constructor to
         /// initialize each of the handlers in turn.
         /// NOTE: The loading process does not automatically imply that
-        /// the handler has registered any kind of an interface, that 
-        /// may be (optionally) done by the handler either during 
+        /// the handler has registered any kind of an interface, that
+        /// may be (optionally) done by the handler either during
         /// construction, or during initialization.
         ///
         /// I was not able to make this code work within a constructor
@@ -136,7 +132,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             {
                 if (!handlersLoaded)
                 {
-
                     ConstructorInfo ci;
                     Object          ht;
 
@@ -167,8 +162,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         // Name is used to differentiate the message header.
 
-        public override string Name 
-        { 
+        public override string Name
+        {
             get { return "HANDLER"; }
         }
 
@@ -181,7 +176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         // We have to rename these because we want
         // to be able to share the values with other
-        // classes in our assembly and the base 
+        // classes in our assembly and the base
         // names are protected.
 
         public string MsgId
@@ -211,7 +206,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         {
             try
             {
-
                 // This plugin will only be enabled if the broader
                 // REST plugin mechanism is enabled.
 
@@ -222,7 +216,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 // IsEnabled is implemented by the base class and
                 // reflects an overall RestPlugin status
 
-                if (!IsEnabled)                     
+                if (!IsEnabled)
                 {
                     Rest.Log.WarnFormat("{0} Plugins are disabled", MsgId);
                     return;
@@ -278,15 +272,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                                         Rest.DumpLineSize);
                 }
 
-                // Load all of the handlers present in the 
+                // Load all of the handlers present in the
                 // assembly
 
                 // In principle, as we're an application plug-in,
                 // most of what needs to be done could be done using
-                // static resources, however the Open Sim plug-in 
-                // model makes this an instance, so that's what we 
+                // static resources, however the Open Sim plug-in
+                // model makes this an instance, so that's what we
                 // need to be.
-                // There is only one Communications manager per 
+                // There is only one Communications manager per
                 // server, and by inference, only one each of the
                 // user, asset, and inventory servers. So we can cache
                 // those using a static initializer.
@@ -329,13 +323,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             {
                 Rest.Log.ErrorFormat("{0} Plugin initialization has failed: {1}", MsgId, e.Message);
             }
-
         }
 
         /// <summary>
         /// In the interests of efficiency, and because we cannot determine whether
         /// or not this instance will actually be harvested, we clobber the only
-        /// anchoring reference to the working state for this plug-in. What the 
+        /// anchoring reference to the working state for this plug-in. What the
         /// call to close does is irrelevant to this class beyond knowing that it
         /// can nullify the reference when it returns.
         /// To make sure everything is copacetic we make sure the primary interface
@@ -344,7 +337,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         public override void Close()
         {
-
             Rest.Log.InfoFormat("{0} Plugin is terminating", MsgId);
 
             try
@@ -352,12 +344,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 RemoveAgentHandler(Rest.Name, this);
             }
             catch (KeyNotFoundException){}
-            
+
             foreach (IRest handler in handlers)
             {
                 handler.Close();
             }
-
         }
 
         #endregion overriding methods
@@ -383,7 +374,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 foreach (string key in pathHandlers.Keys)
                 {
                     Rest.Log.DebugFormat("{0} Match testing {1} against agent prefix <{2}>", MsgId, path, key);
- 
+
                     // Note that Match will not necessarily find the handler that will
                     // actually be used - it does no test for the "closest" fit. It
                     // simply reflects that at least one possible handler exists.
@@ -393,7 +384,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                         Rest.Log.DebugFormat("{0} Matched prefix <{1}>", MsgId, key);
 
                         // This apparently odd evaluation is needed to prevent a match
-                        // on anything other than a URI token boundary. Otherwise we 
+                        // on anything other than a URI token boundary. Otherwise we
                         // may match on URL's that were not intended for this handler.
 
                         return ( path.Length == key.Length ||
@@ -406,9 +397,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
                 foreach (string key in streamHandlers.Keys)
                 {
-
                     Rest.Log.DebugFormat("{0} Match testing {1} against stream prefix <{2}>", MsgId, path, key);
- 
+
                     // Note that Match will not necessarily find the handler that will
                     // actually be used - it does no test for the "closest" fit. It
                     // simply reflects that at least one possible handler exists.
@@ -418,7 +408,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                         Rest.Log.DebugFormat("{0} Matched prefix <{1}>", MsgId, key);
 
                         // This apparently odd evaluation is needed to prevent a match
-                        // on anything other than a URI token boundary. Otherwise we 
+                        // on anything other than a URI token boundary. Otherwise we
                         // may match on URL's that were not intended for this handler.
 
                         return ( path.Length == key.Length ||
@@ -426,7 +416,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
                     }
                 }
-
             }
             catch (Exception e)
             {
@@ -460,7 +449,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
                 for (int i = 0; i < request.Headers.Count; i++)
                 {
-                    Rest.Log.DebugFormat("{0} Header [{1}] : <{2}> = <{3}>", 
+                    Rest.Log.DebugFormat("{0} Header [{1}] : <{2}> = <{3}>",
                                          MsgId, i, request.Headers.GetKey(i), request.Headers.Get(i));
                 }
                 Rest.Log.DebugFormat("{0}    URI: {1}", MsgId, request.RawUrl);
@@ -486,7 +475,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             Rest.Log.DebugFormat("{0} EXIT", MsgId);
 
             return handled;
-
         }
 
         #endregion interface methods
@@ -534,7 +522,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             }
 
             return rdata.handled;
-
         }
 
         /// <summary>
@@ -547,13 +534,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         public void AddStreamHandler(string httpMethod, string path, RestMethod method)
         {
-
             if (!IsEnabled)
             {
                 return;
             }
 
-            if (!path.StartsWith(Rest.Prefix)) 
+            if (!path.StartsWith(Rest.Prefix))
             {
                 path = String.Format("{0}{1}", Rest.Prefix, path);
             }
@@ -571,7 +557,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             {
                 Rest.Log.WarnFormat("{0} Ignoring duplicate handler for {1}", MsgId, path);
             }
-
         }
 
         /// <summary>
@@ -586,10 +571,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         internal bool FindPathHandler(OSHttpRequest request, OSHttpResponse response)
         {
-
             RequestData rdata = null;
             string bestMatch = null;
-            
+
             if (!IsEnabled)
             {
                 return false;
@@ -612,7 +596,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             if (!String.IsNullOrEmpty(bestMatch))
             {
-
                 rdata = pathAllocators[bestMatch](request, response, bestMatch);
 
                 Rest.Log.DebugFormat("{0} Path based REST handler matched with <{1}>", MsgId, bestMatch);
@@ -621,7 +604,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 {
                     pathHandlers[bestMatch](rdata);
                 }
- 
+
                 // A plugin generated error indicates a request-related error
                 // that has been handled by the plugin.
 
@@ -629,11 +612,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 {
                     Rest.Log.WarnFormat("{0} Request failed: {1}", MsgId, r.Message);
                 }
-
             }
 
             return (rdata == null) ? false : rdata.handled;
-
         }
 
         /// <summary>
@@ -643,7 +624,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         public void AddPathHandler(RestMethodHandler mh, string path, RestMethodAllocator ra)
         {
-
             if (!IsEnabled)
             {
                 return;
@@ -665,8 +645,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             pathHandlers.Add(path, mh);
             pathAllocators.Add(path, ra);
-
         }
     }
-
 }