Merge pull request #34 from AzCiS/onesdk-avirupch

Changing exception for Bug 2142619
Azure · Mar 31, 2015 · 2ae6bcc · 2ae6bcc
2 parents b189adf + b0bb062
commit 2ae6bcc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...mple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs b/...mple/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>