From d180df8a12889c4caa8da7a34eaac137fe3a0d5d Mon Sep 17 00:00:00 2001
From: bbaia <brbaia@gmail.com>
Date: Wed, 30 Mar 2011 08:40:04 +0000
Subject: [PATCH] Fixed Spring.ServiceModel.ServiceExporter (SPRNET-1416)

---
 .../ServiceModel/SpringWebServiceHost.cs      |  4 ++--
 .../ServiceModel/ServiceExporterTests.cs      | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs
index 16ab5f1b..ad64d07c 100644
--- a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs
+++ b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs
@@ -109,8 +109,8 @@ namespace Spring.ServiceModel
                 return objectFactory.GetObject(serviceName) as Type;
             }
 
-            return new ServiceProxyTypeBuilder(serviceName, objectFactory.GetType(serviceName), useServiceProxyTypeCache)
-                .BuildProxyType(objectFactory);                    
+            return new ServiceProxyTypeBuilder(serviceName, objectFactory, useServiceProxyTypeCache)
+                .BuildProxyType();                    
         }
 
         #endregion
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
index efc4f1f5..1b7286b5 100644
--- a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
@@ -66,16 +66,8 @@ namespace Spring.ServiceModel
                 se = new ServiceExporter();
                 se.ObjectFactory = objectFactory;
             }
-
-
-
-            
-
-
-
         }
 
-
         [Test]
         //SPRNET-1262
         public void ProxiesDeclarativeAttributeWithConstructorArguments()
@@ -98,7 +90,6 @@ namespace Spring.ServiceModel
                     </object>
                 </objects>";
 
-
             using (Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(xml)))
             {
                 objectFactory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
@@ -131,6 +122,20 @@ namespace Spring.ServiceModel
             se.AfterPropertiesSet();
         }
 
+        [Test] // SPRNET-1416
+        public void CallProxy()
+        {
+            se.ObjectName = "ProxiesContractInterface";
+            se.TargetName = "service";
+            se.AfterPropertiesSet();
+
+            Type proxyType = se.GetObject() as Type;
+            Assert.IsNotNull(proxyType);
+            IContract proxy = Activator.CreateInstance(proxyType) as IContract;
+            Assert.IsNotNull(proxyType);
+            Assert.AreEqual("1979", proxy.SomeMethod(1979));
+        }
+
         [Test]
         public void ProxiesContractInterface()
         {
@@ -355,7 +360,6 @@ namespace Spring.ServiceModel
         //}
 
         #endregion
-
     }
 }
 #endif
\ No newline at end of file