Changeset 8044

Timestamp:

06/18/12 22:26:00 (12 years ago)

Author:

ascheibe

Message:

#1648 fixed NullReferenceExceptions in DTOs

Location:

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients

Files:

• LightweightUser.cs (modified) (3 diffs)
• Resource.cs (modified) (1 diff)
• Role.cs (modified) (2 diffs)
• UserGroup.cs (modified) (1 diff)
• UserGroupBase.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients/LightweightUser.cs

@@ -33 +33 @@
       this.UserName = original.UserName;
       this.EMail = original.EMail;
-      this.Groups = original.Groups.Select(x => (UserGroup)x.Clone(cloner)).ToList();
-      this.Roles = original.Roles.Select(x => (Role)x.Clone(cloner)).ToList();
+      this.Groups = original.Groups != null ? original.Groups.Select(x => (UserGroup)x.Clone(cloner)).ToList() : null;
+      this.Roles = original.Roles != null ? original.Roles.Select(x => (Role)x.Clone(cloner)).ToList() : null;
     }
 
@@ -41 +41 @@
     }
 
-    public LightweightUser() { }
+    public LightweightUser() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -48 +48 @@
 
     public override string ToString() {
-      return UserName + " (" + FullName + ")";
+      return (UserName != null && FullName != null) ? UserName + " (" + FullName + ")" : string.Empty;
     }
   }

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients/Resource.cs

@@ -37 +37 @@
     }
 
-    public Resource() { }
+    public Resource() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients/Role.cs

@@ -35 +35 @@
     }
 
-    public Role() { }
+    public Role() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -42 +42 @@
 
     public override string ToString() {
-      return Name;
+      return Name != null ? Name : string.Empty;
     }
 
     public override bool Equals(object obj) {
-      return ((Role)obj).Name.Equals(this.Name);
+      return Name != null ? ((Role)obj).Name.Equals(this.Name) : false;
     }
 
     public override int GetHashCode() {
-      return Name.GetHashCode();
+      return Name != null ? Name.GetHashCode() : string.Empty.GetHashCode();
     }
   }

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients/UserGroup.cs

@@ -37 +37 @@
     }
 
-    public UserGroup() {
+    public UserGroup()
+      : base() {
       this.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(UserGroup_PropertyChanged);
     }

trunk/sources/HeuristicLab.Clients.Access/3.3/ServiceClients/UserGroupBase.cs

@@ -28 +28 @@
     protected UserGroupBase(UserGroupBase original, Cloner cloner)
       : base(original, cloner) {
-      Id = original.Id;
+      this.Id = original.Id;
     }
 
-    public UserGroupBase() { }
+    public UserGroupBase() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {