touch files to fix remaining whitespace issues created from the origi…

…nal googecode / svn import
ServiceStack · Oct 14, 2012 · e478df1 · e478df1
1 parent 48c0d23
commit e478df1
Show file tree

Hide file tree

Showing 149 changed files with 17,786 additions and 17,753 deletions.
diff --git a/build/build.bat b/build/build.bat
@@ -17,10 +17,10 @@ COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.dll ..\NuGet\
 COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.pdb ..\NuGet\ServiceStack\lib\net35
 COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.xml ..\NuGet\ServiceStack\lib\net35
 COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.ServiceInterface.* ..\NuGet\ServiceStack\lib\net35
-REM COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.dll ..\NuGet\ServiceStack\lib\net40
-REM COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.pdb ..\NuGet\ServiceStack\lib\net40
-REM COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.xml ..\NuGet\ServiceStack\lib\net40
-REM COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.ServiceInterface.* ..\NuGet\ServiceStack\lib\net40
+COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.dll ..\NuGet\ServiceStack\lib\net40
+COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.pdb ..\NuGet\ServiceStack\lib\net40
+COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.xml ..\NuGet\ServiceStack\lib\net40
+COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.ServiceInterface.* ..\NuGet\ServiceStack\lib\net40
 COPY ..\src\ServiceStack.Razor\bin\%BUILD%\ServiceStack.Razor.* ..\NuGet\ServiceStack.Razor\lib\net40
 
 COPY ..\src\ServiceStack.ServiceInterface\bin\%BUILD%\ServiceStack.Common.* ..\NuGet\ServiceStack.Common\lib\net35

diff --git a/src/ServiceStack.Common/ServiceClient.Web/UrlExtensions.cs b/src/ServiceStack.Common/ServiceClient.Web/UrlExtensions.cs
diff --git a/src/ServiceStack.Common/ServiceModel/Serialization/StringMapTypeDeserializer.cs b/src/ServiceStack.Common/ServiceModel/Serialization/StringMapTypeDeserializer.cs
@@ -41,9 +41,9 @@ public StringMapTypeDeserializer(Type type)
             foreach (var propertyInfo in type.GetSerializableProperties())
             {
                 var propertySetFn = JsvDeserializeType.GetSetPropertyMethod(type, propertyInfo);
-			    var propertyType = propertyInfo.PropertyType;
-				var propertyParseStringFn = JsvReader.GetParseFn(propertyType);
-				var propertySerializer = new PropertySerializerEntry(propertySetFn, propertyParseStringFn) { PropertyType = propertyType };
+                var propertyType = propertyInfo.PropertyType;
+                var propertyParseStringFn = JsvReader.GetParseFn(propertyType);
+                var propertySerializer = new PropertySerializerEntry(propertySetFn, propertyParseStringFn) { PropertyType = propertyType };
 
                 var attr = propertyInfo.FirstAttribute<DataMemberAttribute>();
                 if (attr != null && attr.Name != null)
@@ -57,17 +57,17 @@ public StringMapTypeDeserializer(Type type)
         public object PopulateFromMap(object instance, IDictionary<string, string> keyValuePairs)
         {
             string propertyName = null;
-		    string propertyTextValue = null;
-		    PropertySerializerEntry propertySerializerEntry = null;
+            string propertyTextValue = null;
+            PropertySerializerEntry propertySerializerEntry = null;
 
             try
             {
                 if (instance == null) instance = type.CreateInstance();
 
                 foreach (var pair in keyValuePairs)
                 {
-					propertyName = pair.Key;
-					propertyTextValue = pair.Value;
+                    propertyName = pair.Key;
+                    propertyTextValue = pair.Value;
 
                     if (!propertySetterMap.TryGetValue(propertyName, out propertySerializerEntry))
                     {
@@ -78,6 +78,12 @@ public object PopulateFromMap(object instance, IDictionary<string, string> keyVa
                         continue;
                     }
 
+                    if (propertySerializerEntry.PropertySetFn == null)
+                    {
+                        Log.WarnFormat("Could not set value of read-only property '{0}' on type '{1}'", propertyName, type.FullName);
+                        continue;
+                    }
+
                     var value = propertySerializerEntry.PropertyParseStringFn(propertyTextValue);
                     if (value == null)
                     {
@@ -102,7 +108,7 @@ public object PopulateFromMap(object instance, IDictionary<string, string> keyVa
                 if (propertySerializerEntry != null && propertySerializerEntry.PropertyType != null) {
                     serializationException.Data.Add("propertyType", propertySerializerEntry.PropertyType);
                 }
-			    throw serializationException;
+                throw serializationException;
             }
         }