X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FSystem.Data.SqlClient%2FSqlBulkCopyColumnMapping.cs;h=a6ce5e7a3f9b848d81b2ef44db31a6c72d468b27;hb=62c49f89ad1cc35593a00d909ea57bb41955288b;hp=a00f32c7ff67b993e2355279cdc9248b4e0efc03;hpb=1c14f1ee6d701510c15499d71fc2b324151a8629;p=mono.git

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMapping.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMapping.cs
index a00f32c7ff6..a6ce5e7a3f9 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMapping.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlBulkCopyColumnMapping.cs
@@ -28,8 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System.Data.SqlClient
 {
 	/// <summary>
@@ -41,8 +39,8 @@ namespace System.Data.SqlClient
 
 	#region Fields
 	
-	int sourceOrdinal = 0;
-	int destinationOrdinal = 0;
+	int sourceOrdinal = -1;
+	int destinationOrdinal = -1;
 	string sourceColumn = null;
 	string destinationColumn = null;
 
@@ -50,28 +48,27 @@ namespace System.Data.SqlClient
 
 	#region Constructors
 	
-	public SqlBulkCopyColumnMapping(){
-	
+	public SqlBulkCopyColumnMapping() {
 	}
 	
 	public SqlBulkCopyColumnMapping(int sourceColumnOrdinal, int destinationOrdinal){
-		this.sourceOrdinal = sourceColumnOrdinal;
-		this.destinationOrdinal = destinationOrdinal;
+		SourceOrdinal = sourceColumnOrdinal;
+		DestinationOrdinal = destinationOrdinal;
 	}
 
 	public SqlBulkCopyColumnMapping(int sourceColumnOrdinal, string destinationColumn){
-		this.sourceOrdinal = sourceColumnOrdinal;
-		this.destinationColumn = destinationColumn;	
+		SourceOrdinal = sourceColumnOrdinal;
+		DestinationColumn = destinationColumn;	
 	}
 
 	public SqlBulkCopyColumnMapping(string sourceColumn, int destinationOrdinal){
-		this.sourceColumn = sourceColumn;		
-		this.destinationOrdinal = destinationOrdinal;
+		SourceColumn = sourceColumn;		
+		DestinationOrdinal = destinationOrdinal;
 	}
 
 	public SqlBulkCopyColumnMapping(string sourceColumn, string destinationColumn){
-		this.sourceColumn = sourceColumn;
-		this.destinationColumn = destinationColumn;
+		SourceColumn = sourceColumn;
+		DestinationColumn = destinationColumn;
 	}
 
 	# endregion //Constructors	
@@ -104,10 +101,8 @@ namespace System.Data.SqlClient
                         this.sourceOrdinal = -1;
                         this.sourceColumn = value;
                 }
-                                                                                                    
         }
 
-
 	public int DestinationOrdinal {
                 get {
                          return this.destinationOrdinal;
@@ -115,11 +110,10 @@ namespace System.Data.SqlClient
                 set {
                         // ms: whenever the ordinal is set, the name is null
                         if (value < 0)
-				throw new ArgumentOutOfRangeException();
+				throw new IndexOutOfRangeException ();
                         this.destinationColumn = null;
 			this.destinationOrdinal =  value;
                 }
-                                                                                                    
         }
 	
 	public int SourceOrdinal {
@@ -129,19 +123,14 @@ namespace System.Data.SqlClient
                 set {
                         // ms: whenever the ordinal is set, the name is null
                         if (value < 0)
-                                throw new ArgumentOutOfRangeException();
+                                throw new IndexOutOfRangeException ();
                         this.sourceColumn = null;
                         this.sourceOrdinal =  value;
                 }
-                                                                                                    
         }
 
 	#endregion //Properties	
-	
-	}
 
+	}
 }
 
-
-#endif
-