From 6ff3529ff2d4c2fac368fa1c88a578d6506987a8 Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Thu, 15 Sep 2016 16:05:51 -0400 Subject: [PATCH] 8166148: Fix for JDK-8165936 broke solaris builds Reviewed-by: naoto --- jdk/src/java.base/unix/native/libjava/TimeZone_md.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jdk/src/java.base/unix/native/libjava/TimeZone_md.c b/jdk/src/java.base/unix/native/libjava/TimeZone_md.c index a7ab47e5684..f0bb362afc5 100644 --- a/jdk/src/java.base/unix/native/libjava/TimeZone_md.c +++ b/jdk/src/java.base/unix/native/libjava/TimeZone_md.c @@ -136,13 +136,7 @@ findZoneinfoFile(char *buf, size_t size, const char *dir) } name_max = pathconf(dir, _PC_NAME_MAX); - // If pathconf did not work, fall back to NAME_MAX. - if (name_max < 0) { - name_max = NAME_MAX; - } - // Some older System V systems have a very small NAME_MAX size of 14; as - // there is no way to tell readdir_r the output buffer size, lets enforce - // a mimimum buffer size. + // If pathconf did not work, fall back to a mimimum buffer size. if (name_max < 1024) { name_max = 1024; }