Merge pull request ServiceStack#115 from jluchiji/master

mythz · mythz · commit ae68200c4239 · 2012-12-13T10:32:56.000-08:00
Made private send methods in RedisNativeClient protected
diff --git a/src/ServiceStack.Redis/RedisNativeClient_Utils.cs b/src/ServiceStack.Redis/RedisNativeClient_Utils.cs
@@ -303,7 +303,7 @@ private int SafeReadByte()
 			return Bstream.ReadByte();
 		}
 
-		private void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)
+		protected void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -316,7 +316,7 @@ private void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)
 			ExpectSuccess();
 		}
 
-		private int SendExpectInt(params byte[][] cmdWithBinaryArgs)
+        protected int SendExpectInt(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -329,7 +329,7 @@ private int SendExpectInt(params byte[][] cmdWithBinaryArgs)
 			return ReadInt();
 		}
 
-		private long SendExpectLong(params byte[][] cmdWithBinaryArgs)
+        protected long SendExpectLong(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -342,7 +342,7 @@ private long SendExpectLong(params byte[][] cmdWithBinaryArgs)
 			return ReadLong();
 		}
 
-		private byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)
+        protected byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -355,13 +355,13 @@ private byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)
 			return ReadData();
 		}
 
-		private string SendExpectString(params byte[][] cmdWithBinaryArgs)
+        protected string SendExpectString(params byte[][] cmdWithBinaryArgs)
 		{
 			var bytes = SendExpectData(cmdWithBinaryArgs);
 			return bytes.FromUtf8Bytes();
 		}
 
-		private double SendExpectDouble(params byte[][] cmdWithBinaryArgs)
+        protected double SendExpectDouble(params byte[][] cmdWithBinaryArgs)
 		{
 		    var bytes = SendExpectData(cmdWithBinaryArgs);
 		    return bytes == null ? Double.NaN : ParseDouble(bytes);
@@ -377,7 +377,7 @@ public static double ParseDouble(byte[] doubleBytes)
 			return d;
 		}
 
-		private string SendExpectCode(params byte[][] cmdWithBinaryArgs)
+        protected string SendExpectCode(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -391,7 +391,7 @@ private string SendExpectCode(params byte[][] cmdWithBinaryArgs)
 			return ExpectCode();
 		}
 
-		private byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)
+        protected byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)
 		{
 			if (!SendCommand(cmdWithBinaryArgs))
 				throw CreateConnectionError();
@@ -404,7 +404,7 @@ private byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)
 			return ReadMultiData();
 		}
 
-        private object [] SendExpectDeeplyNestedMultiData(params byte[][] cmdWithBinaryArgs)
+        protected object[] SendExpectDeeplyNestedMultiData(params byte[][] cmdWithBinaryArgs)
         {
             if (!SendCommand(cmdWithBinaryArgs))
                 throw CreateConnectionError();

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ private int SafeReadByte()`
`303`	`303`	`return Bstream.ReadByte();`
`304`	`304`	`}`
`305`	`305`
`306`		`- private void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)`
	`306`	`+ protected void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)`
`307`	`307`	`{`
`308`	`308`	`if (!SendCommand(cmdWithBinaryArgs))`
`309`	`309`	`throw CreateConnectionError();`
`@@ -316,7 +316,7 @@ private void SendExpectSuccess(params byte[][] cmdWithBinaryArgs)`
`316`	`316`	`ExpectSuccess();`
`317`	`317`	`}`
`318`	`318`
`319`		`- private int SendExpectInt(params byte[][] cmdWithBinaryArgs)`
	`319`	`+ protected int SendExpectInt(params byte[][] cmdWithBinaryArgs)`
`320`	`320`	`{`
`321`	`321`	`if (!SendCommand(cmdWithBinaryArgs))`
`322`	`322`	`throw CreateConnectionError();`
`@@ -329,7 +329,7 @@ private int SendExpectInt(params byte[][] cmdWithBinaryArgs)`
`329`	`329`	`return ReadInt();`
`330`	`330`	`}`
`331`	`331`
`332`		`- private long SendExpectLong(params byte[][] cmdWithBinaryArgs)`
	`332`	`+ protected long SendExpectLong(params byte[][] cmdWithBinaryArgs)`
`333`	`333`	`{`
`334`	`334`	`if (!SendCommand(cmdWithBinaryArgs))`
`335`	`335`	`throw CreateConnectionError();`
`@@ -342,7 +342,7 @@ private long SendExpectLong(params byte[][] cmdWithBinaryArgs)`
`342`	`342`	`return ReadLong();`
`343`	`343`	`}`
`344`	`344`
`345`		`- private byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)`
	`345`	`+ protected byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)`
`346`	`346`	`{`
`347`	`347`	`if (!SendCommand(cmdWithBinaryArgs))`
`348`	`348`	`throw CreateConnectionError();`
`@@ -355,13 +355,13 @@ private byte[] SendExpectData(params byte[][] cmdWithBinaryArgs)`
`355`	`355`	`return ReadData();`
`356`	`356`	`}`
`357`	`357`
`358`		`- private string SendExpectString(params byte[][] cmdWithBinaryArgs)`
	`358`	`+ protected string SendExpectString(params byte[][] cmdWithBinaryArgs)`
`359`	`359`	`{`
`360`	`360`	`var bytes = SendExpectData(cmdWithBinaryArgs);`
`361`	`361`	`return bytes.FromUtf8Bytes();`
`362`	`362`	`}`
`363`	`363`
`364`		`- private double SendExpectDouble(params byte[][] cmdWithBinaryArgs)`
	`364`	`+ protected double SendExpectDouble(params byte[][] cmdWithBinaryArgs)`
`365`	`365`	`{`
`366`	`366`	`var bytes = SendExpectData(cmdWithBinaryArgs);`
`367`	`367`	`return bytes == null ? Double.NaN : ParseDouble(bytes);`
`@@ -377,7 +377,7 @@ public static double ParseDouble(byte[] doubleBytes)`
`377`	`377`	`return d;`
`378`	`378`	`}`
`379`	`379`
`380`		`- private string SendExpectCode(params byte[][] cmdWithBinaryArgs)`
	`380`	`+ protected string SendExpectCode(params byte[][] cmdWithBinaryArgs)`
`381`	`381`	`{`
`382`	`382`	`if (!SendCommand(cmdWithBinaryArgs))`
`383`	`383`	`throw CreateConnectionError();`
`@@ -391,7 +391,7 @@ private string SendExpectCode(params byte[][] cmdWithBinaryArgs)`
`391`	`391`	`return ExpectCode();`
`392`	`392`	`}`
`393`	`393`
`394`		`- private byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)`
	`394`	`+ protected byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)`
`395`	`395`	`{`
`396`	`396`	`if (!SendCommand(cmdWithBinaryArgs))`
`397`	`397`	`throw CreateConnectionError();`
`@@ -404,7 +404,7 @@ private byte[][] SendExpectMultiData(params byte[][] cmdWithBinaryArgs)`
`404`	`404`	`return ReadMultiData();`
`405`	`405`	`}`
`406`	`406`
`407`		`- private object [] SendExpectDeeplyNestedMultiData(params byte[][] cmdWithBinaryArgs)`
	`407`	`+ protected object[] SendExpectDeeplyNestedMultiData(params byte[][] cmdWithBinaryArgs)`
`408`	`408`	`{`
`409`	`409`	`if (!SendCommand(cmdWithBinaryArgs))`
`410`	`410`	`throw CreateConnectionError();`