You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/01/14 22:09:35 UTC
svn commit: r899411 - in
/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol:
IPrimitiveMapMarshaler.cs XmlPrimitiveMapMarshaler.cs
Author: tabish
Date: Thu Jan 14 21:09:35 2010
New Revision: 899411
URL: http://svn.apache.org/viewvc?rev=899411&view=rev
Log:
Update for Compact Framework compilation
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/IPrimitiveMapMarshaler.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/XmlPrimitiveMapMarshaler.cs
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/IPrimitiveMapMarshaler.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/IPrimitiveMapMarshaler.cs?rev=899411&r1=899410&r2=899411&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/IPrimitiveMapMarshaler.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/IPrimitiveMapMarshaler.cs Thu Jan 14 21:09:35 2010
@@ -28,25 +28,13 @@
public interface IPrimitiveMapMarshaler
{
/// <summary>
- /// Marshals an instance of an IPrimitiveMap to an String object.
+ /// Marshals a PrimitiveMap instance to an serialized byte array.
/// </summary>
- /// <param name="map">
- /// A <see cref="IPrimitiveMap"/>
- /// </param>
- /// <returns>
- /// A <see cref="System.Byte[]"/>
- /// </returns>
byte[] Marshal(IPrimitiveMap map);
/// <summary>
/// Un-marshals an IPrimitiveMap instance from a String object.
/// </summary>
- /// <param name="mapContent">
- /// A <see cref="System.Byte[]"/>
- /// </param>
- /// <returns>
- /// A <see cref="IPrimitiveMap"/>
- /// </returns>
IPrimitiveMap Unmarshal(byte[] mapContent);
/// <summary>
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/XmlPrimitiveMapMarshaler.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/XmlPrimitiveMapMarshaler.cs?rev=899411&r1=899410&r2=899411&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/XmlPrimitiveMapMarshaler.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/XmlPrimitiveMapMarshaler.cs Thu Jan 14 21:09:35 2010
@@ -88,17 +88,15 @@
public IPrimitiveMap Unmarshal(byte[] mapContent)
{
- string content = this.encoder.GetString(mapContent);
+ string xmlString = this.encoder.GetString(mapContent, 0, mapContent.Length);
PrimitiveMap result = new PrimitiveMap();
- if(content == null || content == "")
+ if (xmlString == null || xmlString == "")
{
return result;
}
- String xmlString = this.encoder.GetString(mapContent);
-
XmlReaderSettings settings = new XmlReaderSettings();
settings.IgnoreComments = true;