Merge pull request #34 from AzCiS/onesdk-avirupch

parvezah · parvezah · commit 2ae6bcc43ce8 · 2015-03-31T09:57:16.000+05:30
Changing exception for Bug 2142619
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs
@@ -67,7 +67,7 @@ public override void ExecuteCmdlet()
 
                 if(EncryptionEnabled == true && (string.IsNullOrEmpty(EncryptionKey) || !IsValidAsciiString(EncryptionKey)))
                 {
-                    throw new ArgumentNullException("EncryptionKey");
+                    throw new ArgumentException(Resources.EncryptionKeyNotAcceptableMessage);
                 }
 
                 string encryptedKey = null;
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.resx b/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.resx
@@ -528,6 +528,8 @@ a special character</value>
   </data>
   <data name="SetAzureStorSimpleDeviceNoSettingsProvided" xml:space="preserve">
     <value>No settings were provided for updating device details.</value>
-
+  </data>
+  <data name="EncryptionKeyNotAcceptableMessage" xml:space="preserve">
+    <value>Please provide an encryption key consisting of printable ASCII characters</value>
   </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public override void ExecuteCmdlet()`
`67`	`67`
`68`	`68`	`if(EncryptionEnabled == true && (string.IsNullOrEmpty(EncryptionKey) \|\| !IsValidAsciiString(EncryptionKey)))`
`69`	`69`	`{`
`70`		`- throw new ArgumentNullException("EncryptionKey");`
	`70`	`+ throw new ArgumentException(Resources.EncryptionKeyNotAcceptableMessage);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`string encryptedKey = null;`