cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [cayenne] branch master updated: CAY-2572 Queries are not sorted by name in data map XML
Date Fri, 26 Apr 2019 13:42:23 GMT
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 29da062  CAY-2572 Queries are not sorted by name in data map XML
29da062 is described below

commit 29da0627a973efdc52aab1ba9c53f594c603d40e
Author: Nikita Timofeev <stariy95@gmail.com>
AuthorDate: Fri Apr 26 16:42:18 2019 +0300

    CAY-2572 Queries are not sorted by name in data map XML
---
 RELEASE-NOTES.txt                                                | 1 +
 cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 3ab9145..b53d7c6 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -48,6 +48,7 @@ CAY-2547 CayenneDataObject serialization issue
 CAY-2553 Wrong disjoint prefetch query qualifier
 CAY-2559 Modeler: Warning dialog shows wrong information after changing target entity in
dbRelationship
 CAY-2561 Modeler: cgen type combobox doesn't set templates
+CAY-2572 Queries are not sorted by name in data map XML
 
 ----------------------------------
 Release: 4.1.B1
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
index 5f78888..489c656 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
@@ -326,7 +326,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
 		encodeObjRelationshipsAsXML(encoder, delegate);
 
 		// descriptors at the end just to keep logic from older versions
-		encoder.nested(getQueryDescriptors(), delegate);
+		encoder.nested(new TreeMap<>(getQueryDescriptorMap()), delegate);
 
 		delegate.visitDataMap(this);
 		encoder.end();


Mime
View raw message