Skip to content

Commit 6902517

Browse files
committed
Merge branch 'geomar-madolf-geomar-fix-compare-local-and-server-objects'
2 parents 097a557 + 459581f commit 6902517

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

frost_sta_client/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__title__ = 'frost_sta_client'
2-
__version__ = '1.1.43'
2+
__version__ = '1.1.44'
33
__license__ = 'LGPL3'
44
__author__ = 'Jonathan Vogl'
55
__copyright__ = 'Fraunhofer IOSB'

frost_sta_client/model/entity.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,9 @@ def __eq__(self, other):
109109
return False
110110
if id(self) == id(other):
111111
return True
112-
if self.id != other.id:
113-
return False
112+
if self.id is not None and other.id is not None:
113+
if self.id != other.id:
114+
return False
114115
return True
115116

116117
def __ne__(self, other):

0 commit comments

Comments
 (0)