[Omegat-svn-changes] SF.net SVN: omegat:[10715] trunk/src/org/omegat/core/data/RealProject.java

[<bri...@us...>]

Revision: 10715
          http://sourceforge.net/p/omegat/svn/10715
Author:   briac_pilpre
Date:     2019-05-16 12:44:59 +0000 (Thu, 16 May 2019)
Log Message:
-----------
In case of a rebaseAndSave, the projectTMX was never loaded before the merge.

It was happening when the remote repository was not in sync with the version 
indicated in .repositories/settings.properties. The projectTMX would never had
a chance to load before the rebaseAndSave call.

Modified Paths:
--------------
    trunk/src/org/omegat/core/data/RealProject.java

Modified: trunk/src/org/omegat/core/data/RealProject.java
===================================================================
--- trunk/src/org/omegat/core/data/RealProject.java	2019-05-16 12:35:08 UTC (rev 10714)
+++ trunk/src/org/omegat/core/data/RealProject.java	2019-05-16 12:44:59 UTC (rev 10715)
@@ -1066,6 +1066,16 @@
                 .setListViewThreshold(5);
         String srcLang = config.getSourceLanguage().getLanguage();
         String trgLang = config.getTargetLanguage().getLanguage();
+
+        if (projectTMX == null) {
+            Log.logDebug(LOGGER, "Current project TMX not yet loaded");
+            try {
+                loadTranslations();
+            } catch (Exception e) {
+                throw new RuntimeException("Error loading current project TMX", e);
+            }
+        }
+
         ProjectTMX mergedTMX = SuperTmxMerge.merge(
                 new SyncTMX(baseTMX, OStrings.getString("TMX_MERGE_BASE"), srcLang, trgLang),
                 new SyncTMX(projectTMX, OStrings.getString("TMX_MERGE_MINE"), srcLang, trgLang),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.