Merge of http://hg.netbeans.org/cnd-main/ release82_base
authorffjre@netbeans.org
Sat, 03 Sep 2016 00:09:43 +0000
changeset 3114520c5aa5cdb86a
parent 311449 ea2500b2c093
parent 311451 960d45fdf8ab
child 311453 5681b9f8954d
child 311457 0dd7f5ccb4da
child 311473 9b0eb87ded94
child 311482 1c3872b075fa
child 311504 3510552b5aee
child 312418 b0c3e33a299b
child 312968 17254a98c6de
child 313057 76d9cafcee35
child 313963 4270da1cffd4
Merge of http://hg.netbeans.org/cnd-main/
     1.1 --- a/dlight.remote.impl/external/binaries-list	Fri Sep 02 23:10:43 2016 +0000
     1.2 +++ b/dlight.remote.impl/external/binaries-list	Sat Sep 03 00:09:43 2016 +0000
     1.3 @@ -3,4 +3,4 @@
     1.4  #user:        Vladimir Kvashin <vkvashin@netbeans.org>
     1.5  #date:        Fri Sep 02 21:11:31 2016 +0300
     1.6  #summary:     Fixing #267715 (Tests can't add remote host, because "New Remote Host Setup" wizard fails): native code changes
     1.7 -734BB2E30626B4A5B998C0BE110F855E7E0E8190 fs_server-1.0.zip
     1.8 +C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE fs_server-1.0.zip
     1.9 \ No newline at end of file
     2.1 --- a/dlight.remote.impl/src/org/netbeans/modules/remote/impl/fs/MagicCache.java	Fri Sep 02 23:10:43 2016 +0000
     2.2 +++ b/dlight.remote.impl/src/org/netbeans/modules/remote/impl/fs/MagicCache.java	Sat Sep 03 00:09:43 2016 +0000
     2.3 @@ -112,14 +112,15 @@
     2.4                       return false;
     2.5                  }
     2.6                  updateCache();
     2.7 -            } catch (FileNotFoundException ex) {
     2.8 -                Exceptions.printStackTrace(ex);
     2.9 -            } catch (UnsupportedEncodingException ex) {
    2.10 -                Exceptions.printStackTrace(ex);
    2.11 +            } catch (FileNotFoundException | UnsupportedEncodingException ex) {
    2.12 +                ex.printStackTrace(System.err);
    2.13 +                return false;
    2.14              } catch (InterruptedIOException ex) {
    2.15                  // don't report interruptions
    2.16 +                return false;
    2.17              } catch (IOException ex) {                
    2.18 -                Exceptions.printStackTrace(ex);
    2.19 +                ex.printStackTrace(System.err);
    2.20 +                return false;
    2.21              }
    2.22          }
    2.23          if (od.exists()) {