summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-04-23 12:59:33 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-04-23 12:59:33 (GMT)
commitd76ba055004343f457c5e75200668b2f8161063e (patch)
tree7e02a362825f1542fd7d04e45c7f288323673f5f
parent49fa2af581598627702acfe1312244e91cdb96be (diff)
downloadQCG-Data-d76ba055004343f457c5e75200668b2f8161063e.zip
QCG-Data-d76ba055004343f457c5e75200668b2f8161063e.tar.gz
QCG-Data-d76ba055004343f457c5e75200668b2f8161063e.tar.bz2
[#1362] apparent start-up errors idrop checking for strict acls
-rw-r--r--idrop-swing/release_notes.txt5
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java14
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
3 files changed, 19 insertions, 2 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 22342e6..ff48212 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -38,9 +38,14 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1268] XML Parse Exception in idrop.jnlp
**added jnlp template and improved jnlp file consistency and structure
+
*[#1250] jargon/idrop performance testing and optimization for 3.3.2
**Fix pom.xml for missing reference to idrop-swing module
+*[#1362] apparent start-up errors idrop checking for strict acls
+**Added overhead for rule errors on some servers
+
+
==Outstanding Issues==
Please consult [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
index 732c987..d794e2f 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
@@ -49,6 +49,7 @@ import org.irods.jargon.idrop.desktop.systraygui.utils.FieldFormatHelper;
import org.irods.jargon.idrop.desktop.systraygui.utils.IDropUtils;
import org.irods.jargon.idrop.desktop.systraygui.utils.LocalFileUtils;
import org.irods.jargon.idrop.desktop.systraygui.utils.LookAndFeelManager;
+import org.irods.jargon.idrop.desktop.systraygui.utils.MessageUtil;
import org.irods.jargon.idrop.desktop.systraygui.utils.TreeUtils;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.BreadCrumbNavigationPopup;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.FileSystemModel;
@@ -649,7 +650,18 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
} else {
// look up the strict acl setting for the server, if strict acl, home the person in their user directory
EnvironmentalInfoAO environmentalInfoAO = this.getiDropCore().getIRODSAccessObjectFactory().getEnvironmentalInfoAO(getiDropCore().getIrodsAccount());
- boolean isStrict = environmentalInfoAO.isStrictACLs();
+
+ // overhead for [#1362] apparent start-up errors idrop checking for strict acls
+
+ boolean isStrict = false;
+
+ try {
+ isStrict = environmentalInfoAO.isStrictACLs();
+ } catch (JargonException je) {
+ log.error("error checking is strict, warn and set to false");
+ MessageUtil.showWarning(this, "Error checking if strict ACLS, assuming not strict", "");
+ }
+
log.info("is strict?:{}", isStrict);
if (isStrict) {
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 7f25429..0226a0c 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="2.0.1-SNAPSHOT";
- public static String BUILD_TIME="20130419-1021";
+ public static String BUILD_TIME="20130423-0852";
}