cayenne-commits mailing list archives

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

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


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

commit b14abe402abf8aaef2137e9f9675ec67e165b02c
Author: Nikita Timofeev <stariy95@gmail.com>
AuthorDate: Fri Apr 26 16:40:50 2019 +0300

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

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e1e78f8..37c7f91 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -13,6 +13,7 @@ Date:
 ----------------------------------
 
 Changes:
+
 CAY-2570 Use MySQL adapter for latest versions of MariaDB
 
 Bug Fixes:
@@ -24,6 +25,7 @@ CAY-2564 No import for Property after generation classes with pk properties
 CAY-2566 Flush action generates update for PK attribute in case of toDepPK relationship
 CAY-2568 Class Generation: Superclass Package setting persistence
 CAY-2569 Custom 'Naming Strategy' in Cayenne Modeler
+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